Commit graph

15211 commits

Author SHA1 Message Date
mark_story
b3273e9cc2 Correct documentation.
Options are traditionally above the @param block as it results in easier
to read API docs.
2013-07-11 21:00:11 -04:00
Mark Story
1ecc921e13 Merge pull request #1412 from wernerhp/master
Inflector pluralize and singularize update
2013-07-10 08:59:03 -07:00
Werner Pieterson
64ff9ad387 Fixed indenting 2013-07-10 17:51:42 +02:00
Werner Pieterson
3d83c628eb Added more words to InflectorTest 2013-07-10 17:49:18 +02:00
Werner Pieterson
a27499d88a Updated Inflector's 'pluralize and singularize to correctly handle addisional words.
Updated InflectorTest to test new words.
2013-07-10 17:46:01 +02:00
mark_story
960ce7fa81 Don't use inline assignment.
CakePHP generally avoids inline assignment as it can be confusing and do
the wrong thing.
2013-07-09 21:11:06 -04:00
mark_story
cfa260d8c5 Update ServerShell to use provided documentRoot.
Fix ServerShell from using the wrong path to the routing script when
a custom document root is used. Thanks to Marko Marković for the patch.

Fixes #3909
2013-07-09 21:10:37 -04:00
mark_story
2918ae9c7a Update index.php to serve static files with query strings.
Trim off the query string before attempting to locate the file on the
filesystem. Thanks to Marko Marković for the initial patch.

Fixes #3910
2013-07-09 21:07:12 -04:00
Rachman Chavik
542d594b86 Fix deprecated value in argument and disable caching
This aligns better with changes required in the 3.x branch.
Related: 4bb0a122
2013-07-08 21:55:14 +07:00
Rachman Chavik
0555895de3 Remove leftover temp file 2013-07-07 11:20:37 +07:00
Rachman Chavik
4bb0a1228a Fix I18n to extract plugin model validation messages 2013-07-07 11:20:14 +07:00
Mark Story
481d3920ae Merge pull request #1406 from ravage84/formhelper
Some minor CS improvements to FormHelper
2013-07-06 13:57:47 -07:00
Mark Story
3cf30e3347 Merge pull request #1407 from ravage84/patch-2
Some love for a deprecated class
2013-07-06 13:57:11 -07:00
Marc Würth
a397f034e6 Some love for a deprecated class
Whitespace and wording.

Optionally we could include a version number until when this class will work. I assumed this will be 3.0...
http://www.phpdoc.org/docs/latest/for-users/phpdoc/tags/deprecated.html
I treid that but after I let apigen generate the doc and I saw it did nothing special about it ;-/
2013-07-06 19:50:26 +02:00
Marc Würth
11eeb33644 Some minor CS improvements to FormHelper
Replaced use of deprecated method getVar by get.
Improved DocBocks, mostly data types
Removed deprecated DocBock tag because it's an invalid use of such. This makes the method look like it was deprecated but in reality it's only one of the possible values of one of its parameters.
2013-07-06 19:04:06 +02:00
Mark
4f745a4ecf Merge pull request #1404 from ravage84/patch-2
Fixed two @param data types
2013-07-06 07:56:56 -07:00
Marc Würth
d9882fcc08 Fixed three @param data types 2013-07-06 16:49:21 +02:00
mark_story
a7213b2e64 Update doc block. 2013-07-05 21:25:06 -04:00
Mark Story
b9726b71d1 Merge pull request #1402 from ravage84/patch-2
Minor doc block improvements
2013-07-05 18:24:00 -07:00
Marc Würth
85a75906d4 Minor doc block improvements
http://ch1.php.net/manual/de/exception.construct.php
Second parameter gets only passed by. Exception constructor uses an int for the second parameter,not a string.

Replaced text by docblock @see
http://www.phpdoc.org/docs/latest/for-users/phpdoc/tags/see.html
2013-07-06 00:27:23 +02:00
Mark Story
e876906795 Merge pull request #1401 from dereuromark/master
CS fixes
2013-07-05 08:57:02 -07:00
euromark
af455b4121 correct return types in doc blocks 2013-07-05 17:19:22 +02:00
euromark
ba02678693 doc block corrections 2013-07-05 16:17:23 +02:00
euromark
c478d60e79 bool to boolean 2013-07-05 16:07:29 +02:00
Mark Story
6dd24cc1bd Merge pull request #1400 from dereuromark/master
Coding standards whitespace
2013-07-05 06:29:08 -07:00
euromark
e7f380d2b7 doublespace to single space 2013-07-05 14:36:40 +02:00
euromark
c989624f80 whitespace coding standards 2013-07-05 14:15:18 +02:00
mark_story
06fc8dbfc1 Update version number to 2.3.7 2013-07-04 22:05:00 -04:00
mark_story
c685f6ca13 Make check for .. more specific.
A `..` anywhere in the classname is invalid.
2013-07-04 21:40:30 -04:00
Mark Story
76070871eb Merge pull request #1398 from dereuromark/master-paginator
PaginatorComponent should use model->order if there are no other order conditions.

Fixes #3902
2013-07-04 09:21:40 -07:00
euromark
a620fbbbb8 fix cs 2013-07-04 13:30:08 +02:00
euromark
f680c763b2 ticket-3902 - paginator and display of order via model default order 2013-07-04 13:07:14 +02:00
Mark Story
726738308e Merge pull request #1396 from dereuromark/master-cs-else-block
coding standards and else block simplification
2013-07-03 11:19:28 -07:00
euromark
f389435bae coding standards and else block simplification 2013-07-03 19:27:17 +02:00
Mark Story
f27d4a8e42 Merge pull request #1395 from dereuromark/master-cs
coding standards and simplification of else cases as well as some fixes
2013-07-02 20:08:04 -07:00
euromark
a90cb29c0f simplify else cases 2013-07-03 01:14:41 +02:00
euromark
7cb19b97db coding standards and simplification of else cases as well as some minor fixes 2013-07-03 00:52:48 +02:00
Jose Lorenzo Rodriguez
58149f2315 Backporting from 2.4 fix for booleans in mysql when running PHP 5.5 2013-07-02 16:51:29 -04:30
Mark Story
868dc2e519 Merge pull request #1394 from ravage84/patch-2
Removed superfluous break
2013-07-02 13:01:55 -07:00
Marc Würth
ff1f80349a Removed superfluous break
In every case of the if clause it will return, so break is not needed.
2013-07-02 21:00:24 +02:00
euromark
c671d8da62 use strict comparison for strings 2013-07-02 11:01:02 +02:00
mark_story
2f57a7fb18 Use simpler and faster code.
substr_compare() is up to 2x slower than just substr(). Use a faster,
more common, and simpler to read variant of the same thing.
2013-07-01 23:06:56 -04:00
mark_story
521c293eb1 Fix coding standards. 2013-07-01 22:56:00 -04:00
Mark Story
9a08aeafcf Merge pull request #1377 from ravage84/fix-for-3318
Trim off webroot/index.php when determining base and url.

Trimming off index.php from url and webroot/index.php from base url allows the correct values to be created when a path contains index.php in it.

Fixes #3318
2013-07-01 19:51:34 -07:00
mark_story
9754789b69 Don't load classnames with .. in their names.
Classnames with . in them are invalid and can be leveraged to load code
outside of an application by traversing directories.
2013-07-01 21:21:20 -04:00
Mark Story
da033cbed7 Merge pull request #1375 from dereuromark/master-cake-email
Move boundary calculation inside _render()
2013-07-01 06:12:24 -07:00
Mark Story
7f194b87d0 Merge pull request #1389 from tersmitten/consistent-usage-of-stop
Made _stop() usage in Consoles / Tasks more consistent
2013-07-01 06:07:40 -07:00
Mischa ter Smitten
dad1f16eaf Made _stop() usage in Consoles / Tasks more consistent 2013-07-01 14:15:54 +02:00
Mark
54ca435517 Merge pull request #1388 from ravage84/patch-1
Typo in FormAuthenticate.php
2013-06-30 17:32:14 -07:00
Marc Würth
e84bf65016 Typo in FormAuthenticate.php 2013-07-01 00:03:03 +02:00