adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-16 11:58:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
17855 commits 7 branches 0 tags 44 MiB
Commit graph

17855 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mark Story
f1d01732a5 Merge pull request #4230 from beporter/bug/schemashell-name-file-params-fix 
SchemaShell --name and --file params priority fix.

Fixes #4174
 2014-08-12 12:53:42 -04:00
Brian Porter
4a0f42e179 Doc block capitalization corrections as requested. 2014-08-12 10:48:12 -05:00
Mark Story
4af529e764 Merge pull request #4231 from ceeram/travis 
Slim down travis build matrix
 2014-08-11 15:56:37 -04:00
ceeram
8bec213b5a Update .travis.yml 2014-08-11 19:45:43 +02:00
Brian Porter
7d8d2f2f18 Code sniff fix. 2014-08-11 11:51:09 -05:00
Ceeram
3334bfa455 Slim down travis build matrix 2014-08-11 18:04:35 +02:00
Brian Porter
9b9600fe18 CakeSchema naming fallback. 
Abstracts the `require_once` of the schema file so it can be done twice. The added second call is a fallback for the previous APP_DIR-based naming to provide backwards compatibility.

Removes now-obsolete CakeSchema tests that involved `Configure::read('App.dir')`. The CakeSchema::name is now always static (and predictable) in the default case.
 2014-08-11 10:40:57 -05:00
Brian Porter
543e520ccb Corrects logic to only apply default filename in **all** cases where none provided. 2014-08-11 10:34:30 -05:00
Brian Porter
6358208e32 Figures it'd be a missing paren. 2014-08-11 09:23:56 -05:00
Brian Porter
be9be48c46 More predictable default for CakeShema class naming. 
Instead of using the `APP_DIR` constant, which may change between developer installations of a project and cause issues loading Schemas generated elsewhere, use a fixed string, 'App'.

This is related to CakeDC/migrations#184 and should fully resolve #4174.
 2014-08-11 09:12:16 -05:00
Brian Porter
f93029b29f SchemaShell always uses --file param when present. 
Addresses **part** of the problem described in #4174.

Corrects SchemaShell's startup logic so that when a `--file` param is provided by the user, it is always used even in the case that it matches the default file name (schema.php). This solves a problem when a user wishes to provide a classname using `--name`, but still wants to use the default filename.
 2014-08-11 09:08:59 -05:00
Mark Story
ffefa6425f Merge pull request #4225 from ravage84/php7-uniform-variable-syntax 
Be forward compatible to PHP 7's "Uniform Variable Syntax"
 2014-08-10 22:25:12 -04:00
Marc Würth
120bd37ffa Be forward compatible to PHP 7's "Uniform Variable Syntax" 
https://wiki.php.net/rfc/uniform_variable_syntax
 2014-08-11 01:33:25 +02:00
chinpei215
c246695518 Fix different format of $results in afterFind 
Refs #2529

As of this commit, we can get consistent format of $resutls in afterFind.
And we can keep backward compatibility if Model::$useConsistentAfterFind is set to false.
 2014-08-11 01:19:40 +09:00
chinpei215
c227c14bf2 Fix afterFind() called twice with hasMany relationship 
It occurs when a model and the children models are related to a same model.
For example, such as the following:

* User hasMany Comment
* User hasMany Article
* Article hasMany Comment
 2014-08-11 00:12:03 +09:00
mark_story
cb45821c43 Fix reversed arguments in error message. 2014-08-08 23:29:29 -04:00
mark_story
9c3089796f Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/Model/Model.php
 2014-08-08 23:28:06 -04:00
mark_story
d114fa1431 Update join building to not error out on empty conditions. 
When conditions are empty we can assume one of two things:

* The person made a mistake.
* The person is doing the join conditions in the where clause.

In both cases we should attempt to generate proper SQL.

Fixes #4189
 2014-08-08 10:02:09 -04:00
José Lorenzo Rodríguez
92957913d9 Merge pull request #4023 from cvo-technologies/2.6-basics-context 
Add the other translation shortcuts for context support
 2014-08-07 08:54:11 +02:00
Mark Story
7c8770d577 Merge pull request #4183 from ravage84/patch-1 
Added links to book
 2014-08-06 20:23:05 -04:00
Marc Würth
49bdde88d2 Added links to book 2014-08-07 01:56:53 +02:00
Mark Story
53447fe2fb Merge pull request #4182 from dereuromark/master-cookie 
Fix cookie reading.
 2014-08-06 17:38:59 -04:00
euromark
5f5218f3b2 Fix cookie reading. 2014-08-06 22:53:54 +02:00
Mark Story
dda4933ed0 Merge pull request #4180 from dereuromark/master-readme 
Make readme more shiney and informative.
 2014-08-06 13:06:37 -04:00
Mark S.
2471c64aae Merge pull request #4158 from dereuromark/master-cakesession-hotfix 
Fix notice in CakeSession.
 2014-08-06 18:25:55 +02:00
euromark
60603cd9be Make readme more shiney and informative. 2014-08-06 17:53:31 +02:00
José Lorenzo Rodríguez
c3ded4e290 Merge pull request #4167 from dereuromark/2.6-composer 
Auto-detect composer installed CakePHP folder.
 2014-08-06 10:49:07 +02:00
José Lorenzo Rodríguez
64e74cbaac Merge pull request #4175 from chinpei215/master-issue2268-fix 
Fix afterFind() called twice with belongsTo and hasOne relationships
 2014-08-06 10:48:45 +02:00
Mark Story
221fc862aa Merge pull request #4140 from chinpei215/master-issue2849-fix 
Fix transactions do not get rollbacked in saveAssociated/saveMany.

Fixes #2849
 2014-08-05 20:05:15 -04:00
chinpei215
1fe943d6f1 Fix afterFind() called twice with belongsTo and hasOne relationships 
Refs #2268
 2014-08-06 07:27:04 +09:00
ADmad
fa2cba6dff Merge pull request #4169 from thinkingmedia/patch-1 
Added missing return statement.
 2014-08-05 18:26:12 +05:30
Mathew Foscarini
4957418a4b Added missing return statement. 
PhpStorm is flagging this function as missing a return statement. Using a return statement (instead of the default) makes the intent of the source code clearer.
 2014-08-05 08:39:19 -04:00
euromark
e714341ce3 Auto-detect composer installed CakePHP folder. 2014-08-05 03:53:40 +02:00
Mark Story
b608bdfadb Merge pull request #4164 from dereuromark/2.6-deprecate-ssn-validation 
Deprecate ssn() validation in favor of plugin Localized.
 2014-08-04 19:09:05 -04:00
euromark
816e64bec8 Adjust wording. 2014-08-04 16:46:56 +02:00
euromark
bbcdf2404e Deprecate ssn() validation in favor of plugin Localized. 2014-08-04 16:39:43 +02:00
Mark Story
214d278119 Merge pull request #4161 from dereuromark/master-cs-equals 
CS fixes.
 2014-08-04 10:06:41 -04:00
euromark
9ef7b5713a CS fixes. 2014-08-04 13:53:52 +02:00
euromark
864f5e06f6 Fix notice in CakeSession. 2014-08-04 13:32:20 +02:00
mark_story
4e168ca004 Fix incorrect docs. 2014-08-03 20:36:31 -04:00
chinpei215
cb376bf420 Add some more transaction tests 
And remove 2 else clauses.
 2014-08-03 22:34:11 +09:00
Mark Story
2359e89c78 Merge pull request #4150 from ADmad/2.5-cachehelper-exception 
Throw exception instead of logging in debug mode when view cache fails.
 2014-08-02 18:45:48 -04:00
ADmad
c193ce708a Throw exception instead of logging in debug mode. 2014-08-03 03:16:39 +05:30
ADmad
713f430fc4 Merge branch 'master' into 2.6 2014-08-03 01:05:36 +05:30
chinpei215
799500ce6d Fix transactions do not get rollbacked in saveAssociated/saveMany 
Refs #2849
 2014-08-02 10:12:33 +09:00
chinpei215
3d77ce5d34 Fix serveral tests pass regardless of whether data is valid or not 2014-08-02 09:55:29 +09:00
ADmad
8e40fcf5ef Merge pull request #4131 from williamn/master 
Update HtmlHelper.php
 2014-08-01 10:39:47 +05:30
William Notowidagdo
23954e6ad3 Update HtmlHelper.php 
No need to add `null` to `$options` param as mentioned in the docs section: [Using blocks for script and CSS files](http://book.cakephp.org/2.0/en/views.html#using-blocks-for-script-and-css-files)
 2014-08-01 11:22:29 +07:00
Mark Story
a6caf28ea6 Merge pull request #4122 from chinpei215/master-scaffold-error-fix 
Fix a fatal error occurs in combination with a scaffold error.
 2014-07-31 10:44:33 -04:00
ADmad
896065d718 Merge pull request #4117 from antograssiot/master 
master - `a` / `an` typo fixes for API
 2014-07-31 09:31:14 +05:30