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
wbkostan
9a36ed5785
Update Inflector.php
...
Modified singularizer inside inflector to accurately inflect most words ending in -aves. Removed irregular cases solved by this fix.
2014-03-19 19:12:44 -04:00
Mark Story
c53131f434
Merge pull request #3066 from ravage84/patch-1
...
testcases => test cases
2014-03-19 13:09:29 -04:00
Marc Würth
c6f723059c
testcases => test cases
2014-03-19 17:30:10 +01:00
euromark
97c148a170
Correct typo
2014-03-19 12:47:31 +01:00
mark_story
afc8587949
Merge branch 'master' into 2.5
2014-03-18 22:12:14 -04:00
mark_story
ee895a8bb1
Add form attribute to hidden inputs when present.
...
If inputs are placed outside of the form elements the form attribute
needs to be set on the hidden inputs. Without this attribute the empty
state does not submit correctly.
Fixes #3053
2014-03-18 22:11:57 -04:00
Mark Story
23350eb89e
Merge pull request #3051 from occitech/master
...
Themed CakeEmail should load view helpers with the theme set
2014-03-18 10:07:24 -04:00
Hadrien
d55a167830
Themed CakeEmail should load view helpers with the theme set
2014-03-18 14:22:24 +01:00
mark_story
d559e429e6
Merge branch 'http-response-code' into master.
...
Merge changes from #3016 into master.
Closes #3016
2014-03-17 13:09:03 -04:00
mark_story
9888209e9a
Add tests and fix issues with multiple trailing whitespaces.
...
Closes #3016
2014-03-17 13:08:46 -04:00
Mark Story
9534d0d1e7
Merge pull request #3027 from ADmad/2.5-requesthandler-ext
...
Remove setting of Controller::$ext by RequestHandler.
2014-03-16 11:36:58 -04:00
ADmad
961f9d7669
Merge branch 'master' into 2.5
2014-03-16 20:17:24 +05:30
ADmad
abacf0d14b
Remove setting of Controller::$ext by RequestHandler.
...
Closes #3022
2014-03-16 20:09:08 +05:30
ndm2
0ae225615c
Match SP as per rfc2821
2014-03-15 11:47:13 +01:00
Mark Story
100595b717
Merge pull request #3015 from cakephp/dbosource-bc-fix
...
2.5 - Dbosource bc fix
2014-03-14 14:28:21 -04:00
Wouter van Dongen
5035613157
* Fixed bug where select query in deleteAll could return wrong table name.
...
PDOStatement::getColumnMeta (in mysql.php) sometimes returns the actual
table name when using a MySQL view with the distinct select query, and not
the alias table name. By returning the actual table name the records
could not be removed.
By the way PDOStatement::getColumnMeta is an experimental function,
perhaps it's better to avoid it.
2014-03-14 15:20:12 +01:00
samokspv
9e15042eff
changed regexp for response code
...
Facebook servers have now HTTP response without status string. The use
"HTTP/1.1 200 "
while CakePHP needs
"HTTP/1.1 200 Ok"
because preg_match() in code use + instead *
2014-03-13 19:11:14 +02:00
mark_story
7b2ac816c6
Retain the original file name so errors can be generated properly.
...
We should hold onto the original file so we can generate a error message
when the file is not found.
Fixes #2990
Closes #3011
2014-03-13 12:29:16 -04:00
ndm2
c1824071c9
Expose last SMTP response.
2014-03-13 16:28:54 +01:00
ndm2
5326073c80
Refactor some code into overridable methods.
...
This should make the transport a little more extensibility friendly.
2014-03-13 16:06:43 +01:00
mark_story
3a226b03c3
Remove typehint from generateAssociationQuery()
...
While I think typehints are generally a good idea, this one broke a few
plugins, notably CakeDC/search. I don't think it is wise for 2.X release
to break BC in that way. I think reverting this change is probably the
safest path right now.
2014-03-12 23:42:21 -04:00
mark_story
5a944734b8
Remove typehint on $LinkModel argument.
...
Adding a typehint here causes errors in a few userland plugins. We
should honor the previous interface as best we can.
2014-03-12 23:30:46 -04:00
Lucas Freitas
4cd6ac2f15
Fix break of the CS on Travis
2014-03-13 00:24:16 -03:00
Mark Story
0d4a6e358e
Merge pull request #3005 from Tounu/2.5
...
Allow sub-directories in Fixture folder
2014-03-12 09:15:49 -04:00
Mark Oberemk
3f7eff1843
Update HtmlHelper.php
...
Updated documentation to include the chained $this return
2014-03-12 08:59:12 -04:00
Mark Story
fda242f000
Merge pull request #2961 from ovidiupruteanu/patch-3
...
Sqlserver->describe failing for models with a schemaName
2014-03-11 21:03:54 -04:00
mark_story
c5b6dda82f
Merge branch 'master' into 2.5
2014-03-11 21:02:27 -04:00
Tounu
b53c93031a
Merge pull request #4 from Tounu/patch-5
...
Php cs fixed
2014-03-11 21:16:55 +01:00
Tounu
482b90e6b1
Php cs fixed
2014-03-11 21:16:30 +01:00
Tounu
91e52ff31a
Merge pull request #3 from Tounu/patch-4
...
Creation of a method to parse fixture path
2014-03-11 20:56:57 +01:00
Tounu
e4c47f87dd
Creation of a method to parse fixture path
...
Creation of `_parseFixturePath`
2014-03-11 20:55:46 +01:00