Joseph Woodruff
d526fdadc1
Base model class no longer changes an already defined schemaName value
2014-04-02 13:58:29 -06:00
José Lorenzo Rodríguez
bf28e69501
Merge pull request #3197 from dereuromark/master-cs
...
cs
2014-04-02 08:32:26 +02:00
euromark
b150e33472
correct missed cs errors
2014-04-02 03:16:03 +02:00
euromark
e544340d67
fix indentation
2014-04-02 03:12:22 +02:00
euromark
bbe3b6a439
more cs
2014-04-02 03:09:42 +02:00
euromark
0d09a54033
more missing doc block tags added
2014-04-02 03:02:37 +02:00
euromark
44952b06a4
cs
2014-04-02 02:23:43 +02:00
Mark Story
9892cd0240
Merge pull request #3196 from bcrowe/2.5-fix-merge
...
Remove leftover HEAD from merge
2014-04-01 20:04:11 -04:00
Bryan Crowe
c7af3da371
Remove leftover HEAD from merge
2014-04-01 19:54:45 -04:00
ADmad
7a4a806db1
Merge pull request #3193 from beporter/feature/phpunit-required-version
...
Adds phpunit required version to TestShell "not found" error message.
2014-04-01 21:54:28 +05:30
Brian Porter
e5dd8acb60
Adds phpunit required version to TestShell "not found" error message.
2014-04-01 11:08:46 -05:00
Mark
997154565f
Merge pull request #3186 from bcrowe/hotfix-yoda-test
...
Fix yoda condition in File test
2014-04-01 00:56:29 +02:00
Bryan Crowe
b93f373f16
Fix yoda condition in File test
2014-03-31 17:40:35 -04:00
mark_story
7419ac35b0
Merge branch '2.5' of github.com:cakephp/cakephp into 2.5
2014-03-30 21:25:19 -04:00
mark_story
f9b45f1b60
Merge branch 'master' into 2.5
2014-03-30 21:24:55 -04:00
Mark Story
11a5a0ae35
Merge pull request #3152 from ADmad/2.5-controller-invoking
...
2.5 controller invoking
2014-03-30 20:50:52 -04:00
ADmad
10f294d6bb
Remove $reponse param of Dispatcher::_invoke().
...
Use controller's $response property by default.
2014-03-30 19:29:07 +05:30
mark_story
d713ff2c6a
Correct docblock.
...
Refs #3147
2014-03-29 20:19:34 -04:00
Mark Story
d05afe2899
Merge pull request #3147 from planardothum/persistent-fixture
...
Expose canUseMemory
2014-03-29 20:18:56 -04:00
Mark Story
d3855f869a
Merge pull request #3156 from sam-at-github/acl-shell-delete-all
...
Make `cake acl delete <acl-object>` delete all matching records.
2014-03-29 08:58:04 -04:00
sam-at-github
dbbf6c6ad9
No array short syntax in 2.4\!
2014-03-29 22:40:58 +11:00
sam-at-github
863a8555d9
Fixed CS issues. Fixed bug - added missing condition to find.
2014-03-29 22:36:06 +11:00
sam-at-github
a3fe7cd245
on cake acl delete <> delete all matching records. Makes more sense than deleting one of possibly many.
2014-03-29 13:37:08 +11:00
Harold Putman
522b5048f8
Expose canUseMemory
...
This lets Fixture be used to create an actual persistent table with InnoDB engine instead of MEMORY.
2014-03-28 09:24:49 -04:00
Mark Story
77db212b38
Merge pull request #3146 from sam-at-github/baseauthorize-crud
...
Removed arbitrary restriction on crud operations in BaseAuthorize.
2014-03-28 07:10:36 -04:00
sam-at-github
5ceb4abe1a
Removed arbitrary restriction on crud operations. Added some comments to explain parameters to mapActions() better.
2014-03-28 13:35:08 +11:00
mark_story
6bf21c4a43
Update doc blocks to not be lies.
2014-03-27 11:55:54 -04:00
mark_story
c17cc39f08
Update version number to 2.5.0-beta
2014-03-25 21:31:38 -04:00
mark_story
381b3fc9c3
Merge branch 'master' into 2.5
2014-03-25 21:30:56 -04:00
Mark Story
21d91b15bd
Merge pull request #3110 from cakephp/2.5-dbosource-joins
...
Insert manual joins *after* generated joins.
2014-03-24 15:23:20 -04:00
mark_story
ff73229ab8
Fix failing tests.
...
Not everyone uses the same database names as me.
2014-03-24 10:04:19 -04:00
mark_story
2fe8c4050b
Insert manual joins *after* generated joins.
...
Re-order query joins to make manually added joins be performed after
generated joins. This removes the need to workaround the current join
order, or redefine all association joins when you want to add an
additional join on a leaf table.
Refs #2179
Refs #2346
2014-03-23 21:09:08 -04:00
mark_story
de9a5a5845
Add deprecated flag to methods that are removed in 3.0.
...
A few methods in Controller were not marked as deprecated, but already
removed in 3.0. Shore up that difference.
Refs #3105
2014-03-23 20:40:17 -04:00
ADmad
a89b313ce8
Merge pull request #3107 from func0der/ticket-1894-squashed
...
Introduced I18n category constants (#1894 )
2014-03-24 03:07:13 +05:30
func0der
06f47ee01f
Introduced I18n category constants ( #1894 )
...
Replaced all hard coded category values
2014-03-23 17:00:17 +01:00
mark_story
57b8008dbe
Merge branch 'master' into 2.5
2014-03-23 11:01:13 -04:00
mark_story
75fcc7c2f8
Don't use count() in a loop.
...
Use do while so the count does not happen in a loop statement. This
makes the code linter happier.
2014-03-23 11:00:59 -04:00
Mark Story
dea6709d89
Merge pull request #3014 from ndm2/smtp-extensibility-response-access
...
SMTP transport - Extensibility and response access
2014-03-23 09:24:21 -04:00
Mark Story
90ca41d436
Merge pull request #2941 from lucasff/master
...
Allow the passing parameter escape of the getCrumbList method
2014-03-23 09:23:06 -04:00
mark_story
8acb75425d
Merge branch 'master' into 2.5
...
Conflicts:
CONTRIBUTING.md
lib/Cake/Model/Datasource/DboSource.php
2014-03-21 22:55:28 -04:00
mark_story
a801be30d9
Use alternate quoting in assertTags()
...
When a preg pattern contains no `.` it probably doesn't need quote
anchors.
2014-03-21 22:53:25 -04:00
mark_story
f12b272758
Fix a few flaky/bad attribute matchers.
2014-03-21 22:52:52 -04:00
mark_story
af68f61e7a
Make assertTags() run much faster.
...
Generating the various permutations a priori is incredibly expensive
with sets of attributes. Using nested loops that look for matches is
more efficient.
Add replacments for `.*` and `.+` in preg:/ prefixed attribute matchers
so they do not greedily eat all content. This also requires that preg:/
based attribute matchers *must* be quoted.
Fixes #3072
2014-03-21 22:52:52 -04:00
mark_story
c1b2b560bb
Fix typo.
2014-03-21 22:52:52 -04:00
mark_story
a827b96804
Clean up doc blocks for assertTags.
2014-03-21 22:52:52 -04:00
Mark Story
7f96a772be
Merge pull request #3089 from jameswatts/feature/dbosource-circular-reference
...
Update in_array() check to avoid fatal error
2014-03-21 14:41:13 -04:00
James Watts
2eadb89ff6
Update in_array() check to avoid fatal error
...
Enabling the $strict parameter to true avoids PHP's default behavior when search for an array in an array, which throws a fatal error if circular references exist - http://php.net/in_array#refsect1-function.in-array-parameters
2014-03-21 16:16:32 +01:00
Mark Story
514974900f
Merge pull request #3021 from wvdongen/master
...
Fixed bug where select query in deleteAll could return wrong table name
2014-03-21 08:21:24 -04:00
Mark Story
8c81cec904
Merge pull request #3069 from wbkostan/master
...
Modifications to singulizer rules for Inflector.php. Supported with test cases
2014-03-19 20:32:28 -04:00
wbkostan
fea60bfe51
Update InflectorTest.php
...
Added test cases for changes to inflector which affected words ending -aves. Author acknowledges the homonym conflict with 'leaves' and 'leaves', but preferences the word whose singular avoids an exception to the inflection rule.
2014-03-19 19:17:52 -04:00
