Commit graph

5569 commits

Author SHA1 Message Date
Saleh Souzanchi
cc0c65d7ea update tests 2013-10-28 02:24:58 +03:30
Saleh Souzanchi
7c4a698bde update tests 2013-10-28 02:11:49 +03:30
Saleh Souzanchi
ab96ed56f3 fix multi connection/part downloading file 2013-10-28 01:06:33 +03:30
Saleh Souzanchi
459de09144 optimise download file 2013-10-28 01:03:06 +03:30
Saleh Souzanchi
bfde2d136f fix spell of contentType 2013-10-28 00:49:40 +03:30
Saleh Souzanchi
1f13f86367 add mkv mime file type 2013-10-28 00:14:38 +03:30
José Lorenzo Rodríguez
81e6a56543 Merge pull request #2201 from ravage84/start-viewblock-twice
Throw an exception when starting a view block twice
2013-10-27 03:22:35 -07:00
Phally
9260a78ea3 Fixes last items for #1665.
- Changes double quotes to single quotes.
- Documents and tests array-based string replace.
- Rewrites test case.

Rewrites the test case because the tests didn't work as well as
they should be. The test file copied itself to the tmp directory,
did some string replace stuff on it and then loaded the data to
test its contents. However in those contents were also the
expectations, so assertContains() would always see the string in
the file... even if the replacing didn't work.

Closes #1665.
2013-10-26 14:50:42 +02:00
rooseveltrp
98e11cea5d Adds File::replaceText().
Added File::replace()

Searches for a given text and replaces the text if found

Renamed File::replace() to File::replaceText()

Updated the replaceText() method to utilize File Locking

Updated File::replaceText()

1. Method now checks if the lock is not identical to null
2. Since the method uses File::read() to get the contents of the file,
there is no need for a temporary file. Removed the temporary file
creation

File::replaceText() update

Opening file with r+ mode
2013-10-26 14:05:12 +02:00
mark_story
411f510406 Fix file always being set to 'schema.php'
When the name parameter is set and no custom file value is provided,
the name should be used to generate the file name. empty() cannot be
used because the file parameter has a default value of 'schema.php'.

Fixes #2202
2013-10-25 23:36:25 -04:00
Marc Würth
39cd7565ef Throw an exception when starting a view block twice 2013-10-26 03:35:12 +02:00
Mark Story
3dc60af166 Merge pull request #2204 from thatcode/master
Models fetched by Containable find depend on number of fields in intermediate Model
2013-10-25 17:33:32 -07:00
euromark
4048c686b7 coding standards 2013-10-25 19:29:33 +02:00
mark_story
7624884240 Use + instead of array_merge.
If you have numeric columns in your database, array_merge() will re-key
the array dropping the original values.

Fixes #2198
2013-10-25 10:23:50 -04:00
Robert Sworder
456645d7ad Update tests for incorrect containable behaviour if a model only finds 1 field. 2013-10-25 15:15:52 +01:00
Robert Sworder
940a51b5fa Update definition of an empty model. 2013-10-25 15:12:03 +01:00
euromark
8a90cbd4fe coding standards 2013-10-24 23:14:09 +02:00
Mark Story
ea0c66e713 Merge pull request #2187 from bar/model-optimizations
Optimize conditionals and reduce lookups.
2013-10-24 14:09:47 -07:00
Mark Story
d7f37efc34 Merge pull request #2196 from ravage84/orphaned-home
Emptied home.ctp in test_app as much as possible
2013-10-24 09:21:00 -07:00
Marc Würth
86bc9d73cf Emptied home.ctp in test_app as much as possible
This file is never seen by anyone but gets analyzed by
``ExtractTaskTest::testExecute()``
2013-10-24 16:57:58 +02:00
José Lorenzo Rodríguez
a6eb348e2f Merge pull request #2194 from ravage84/gh-link-home.ctp
Improved wording of link to GH repo in home.ctp
2013-10-24 07:33:19 -07:00
ADmad
df523ded7c Fixed docblock. Closes #2193 2013-10-24 19:27:56 +05:30
Marc Würth
0e348dfbbd Improved wording of link to GH repo in home.ctp 2013-10-24 15:51:59 +02:00
Marc Würth
3773311cc0 Normalized associated models in unbindModel.
Resolves #1764

 Had to cast $models to an array since ``Hash::normalize()`` doesn't support strings which ``Set::normalize()`` does (but which is deprecated).
 Reused existing tests.
2013-10-24 15:28:31 +02:00
Ber Clausen
1fbe9c0021 Optimize conditionals and reduce lookups.
Also, make the code easier to read removing unneded indentations.
2013-10-24 10:16:55 -03:00
José Lorenzo Rodríguez
230b9dac66 Merge pull request #2191 from jameswatts/feature/skel-links
Updated links to CakePHP resources
2013-10-24 05:42:37 -07:00
José Lorenzo Rodríguez
45bd01fdc0 Merge pull request #2132 from dereuromark/2.5-paginator-sort
Ability to use PaginatorHelper::sort() with only one direction.
2013-10-24 05:40:42 -07:00
James Watts
12f0cc0559 Updated links to CakePHP resources 2013-10-24 14:39:32 +02:00
Marc Würth
7c07d37fb3 Some DocBlock improvements for Model.php 2013-10-24 13:05:32 +02:00
Ber Clausen
6dcfd28600 Optimize _clearCache().
It is cheaper to make an assignment or call strtolower() than to pluralize.
2013-10-23 22:29:42 -03:00
Mark Story
43fccc1cbf Merge pull request #2184 from ravage84/sortby
Renamed $sortby to $sortBy in sortByKey
2013-10-23 09:42:28 -07:00
mark_story
23b23d8050 Fix delivery issues with long subject lines and MailTransport.
A few people have reported issues sending wrapped messages via
MailTransport. Removing the new lines has been suggested as a fix.

Refs #2176
2013-10-23 12:41:57 -04:00
Marc Würth
c44135a50b Renamed $sortby to $sortBy in sortByKey 2013-10-23 17:28:48 +02:00
Mark Story
b4a0182bf0 Merge pull request #2181 from bcrowe/hotfix-classname
Add space between classname(s)
2013-10-23 04:37:23 -07:00
Mark Story
bd4aff13ee Merge pull request #2180 from bcrowe/hotfix-strict
Strict null check on group parameter
2013-10-22 20:13:37 -07:00
Bryan Crowe
a943ea5c34 Add space between classname(s) 2013-10-22 22:59:50 -04:00
mark_story
328fcdc376 Sync skel and app directories.
Closes #1698
2013-10-22 22:18:59 -04:00
Bryan Crowe
79846d25f8 Strict null check on group parameter 2013-10-22 22:11:02 -04:00
mark_story
75624c0279 Update version number to 2.4.2 2013-10-22 21:49:25 -04:00
Frank de Graaf
ab89f6ec97 Makes DboSource less string dependent. 2013-10-22 16:43:32 +02:00
Bryan Crowe
d39ced8381 Correct 'an URL' to 'a URL' in docblocks 2013-10-22 00:09:34 -04:00
mark_story
e27e887707 Deprecate features being removed in 3.0 2013-10-21 16:55:21 -04:00
euromark
fca8a01c15 Correct casing of class names. 2013-10-21 22:34:29 +02:00
mark_story
bcafde6212 Add numeric validator for float fields by default.
Make bake add numeric validator to float fields.

Fixes #2163
2013-10-20 22:54:30 -04:00
euromark
c08df2a7f9 Correct wording of Hash::expand() 2013-10-19 17:54:43 +02:00
euromark
def015108d Ability to use PaginatorHelper::sort() with only one direction. 2013-10-19 12:44:50 +02:00
Cameri
2b234236d6 Removed /mpm from 'url' option for last test in JqueryEngineHelper::testRequest(). 2013-10-18 11:41:38 -04:00
Cameri
069b309249 Added test case for JqueryEngineHelper::request() to validate 'xhr' callback. 2013-10-18 11:00:15 -04:00
Cameri
bb33d52cc6 Added 'xhr' as callback in JqueryEngineHelper::request() so it formats as Javascript. 2013-10-17 18:26:39 -04:00
mark_story
1ae470a284 Fix inflection rules for curves.
Remove curve from the uninflected list and update rules so it, wolves,
and lives are still properly handled.

Fixes #2148
2013-10-17 12:15:56 -04:00