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

715 commits

Author SHA1 Message Date
mark_story
a098d96c94 Remove flaky test that was of questionable value. 2014-07-10 14:39:20 -04:00
mark_story
3a70d9c033 Merge branch 'master' into 2.6 2014-07-09 10:17:05 -04:00
Marc Würth
c321a8fa93 Hash::nest() should throw an exception instead of returning an empty array 
Refs: https://github.com/cakephp/cakephp/pull/3498#issuecomment-48316204
 2014-07-08 13:01:02 +02:00
mark_story
3936cce4b8 Disallow hexadecimal input with inList. 
Instead of turning on/off strict mode based on the user supplied input,
cast everything to strings and always use a strict check. This avoids
the potential issue of a bad user using hexadecimal when they should not
be allowed to do so. Thanks to 'Kurita Takashi' for pointing this out.
 2014-07-03 22:10:49 -04:00
mark_story
2bcd817367 Merge branch 'master' into 2.6 2014-07-03 11:13:06 -04:00
euromark
974ca851c2 Correct doc blocks according to cs guidelines. 
Remove superfluous empty lines.
 2014-07-03 15:36:42 +02:00
mark_story
b1610c145e Merge branch 'master' into 2.6 2014-07-02 23:39:16 -04:00
ADmad
607200fa7b Add pluralization rule for "stadia". 
Refs #3830
 2014-06-29 14:51:23 +05:30
mark_story
a40fa5cae9 Add test for #3754 2014-06-25 09:19:24 -04:00
ADmad
9a1a965b1c Update isAbsolute() to recognize stream wrapper paths. 
This has the benefit that the realpath() method is not applied to a
registered stream wrapper in the constructor of the Folder class.
Using the realpath() method will break the stream.

Thank "davalb" for the original patch.
 2014-06-22 13:43:14 +05:30
mark_story
497ecd3f80 Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/VERSION.txt
 2014-06-19 21:41:02 -04:00
mark_story
fa19c34580 Fix Hash::extract() not matching 1/0 to true/false. 
Historically [prop=1] has matched prop=true as well. This restores that
and also fixes [prop=0] not finding falsey values.

This makes the typing less strict in Hash::extract() but I don't think
it is unreasonable given PHP's type juggling.

Refs #3288
 2014-06-12 11:30:48 -04:00
mark_story
92eeef8ae0 Merge branch 'master' into 2.6 2014-06-02 22:57:25 -04:00
ADmad
543066f34a Set default sort direction to 'asc'. 2014-05-30 19:43:09 +05:30
Mark Story
9c9d45596f Merge pull request #3478 from Schlaefer/#3303-lengthBetween 
closes #3303 RFC: Rename Validator::between() into Validator::length()
 2014-05-24 16:48:05 -04:00
euromark
143e8e4c56 Make sure invalid arrays return empty array instead of throwing notices. 2014-05-14 23:53:58 +02:00
Schlaefer
3ac731273e adds backwards compatible 'between' alias for 'lengthBetween' validation rule 2014-05-13 17:36:23 +02:00
Schlaefer
e10e8fcb15 fixes failing test case ValidationTest::testDecimalLocaleSet() on OS X 
thousand separator isn't set in de_DE but in da_DK
 2014-05-13 13:25:53 +02:00
Schlaefer
4848b63189 closes #3303 RFC: Rename Validator::between() into Validator::length() 2014-05-13 09:31:03 +02:00
ADmad
d466e00644 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Test/Case/Model/Datasource/Database/MysqlTest.php
	lib/Cake/Utility/Folder.php
	lib/Cake/VERSION.txt
 2014-05-04 14:35:36 +05:30
euromark
7a287a6942 More coding standard corrections. 2014-04-29 14:19:33 +02:00
mark_story
de0062de77 Merge branch 'master' into 2.5 2014-04-25 22:10:02 -04:00
Stefan Dickmann
f90f718e11 change parameter order 2014-04-24 12:54:45 +02:00
euromark
0c036f6370 Remove unncessary language support. 2014-04-23 18:07:08 +02:00
euromark
7e6bc48ef2 Complete Inflector transliterations. 2014-04-23 16:43:44 +02:00
ADmad
6bdfdfd436 Optimize view paths caching for plugins. 
Closes #2047
 2014-04-20 02:02:07 +05:30
mark_story
bf9c3029cb Merge branch 'master' into 2.5 2014-04-10 20:51:49 -04:00
mark_story
c6173a0054 Add tests for #3288 and remove nested ternaries. 
Nested ternaries are complicated to maintain and hard to read. Break
down the nested ternary into two conditionals.
 2014-04-10 20:37:08 -04:00
Jose Lorenzo Rodriguez
343d3279b9 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
 2014-04-06 21:50:41 +02:00
euromark
e544340d67 fix indentation 2014-04-02 03:12:22 +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
Bryan Crowe
b93f373f16 Fix yoda condition in File test 2014-03-31 17:40:35 -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
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
mark_story
6c3bc48ce0 Merge branch 'master' into 2.5 2014-03-06 17:45:00 -05:00
ndm2
008ad3237c Fix verification of expected invocations #2919 2014-03-01 19:06:17 +01:00
mark_story
0f584c0e8b Merge branch 'master' into 2.5 2014-02-24 21:19:17 -05:00
AD7six
4e0627232c account for localized floats more robustly. 
Normalize floats, strings too, so that they are validated as

    dddddddddd.dd

ref #2853
 2014-02-19 15:04:25 +00:00
mark_story
b8c94fa5d4 Merge branch 'master' into 2.5 2014-02-18 22:19:12 -05:00
mark_story
0a51458ffd Fix Validation::decimal() not working with localized floats. 
Use similar workarounds as DboSource::value() for accepting localized
floats.

Fixes #2853
 2014-02-18 22:18:56 -05:00
Mark Story
c325a93998 Merge pull request #2741 from ADmad/2.5-mimetype 
Added regex support to Validation::mimeType().
 2014-02-17 10:10:48 -05:00
ADmad
9ae7f11a2a Made mimetype check case insensitive. 2014-02-17 11:48:00 +05:30
mark_story
cde93ca7b9 2.x needs to be compatible with PHP<5.4 2014-02-16 21:37:28 -05:00
mark_story
3919f93149 Use simpler assertions. 2014-02-16 14:37:29 -05:00
mark_story
7a4cabe5d3 Add depth to log(). 
Much like dump() it is handy to be able to control the depth variables
are dumped out when logged.

Refs #2834
 2014-02-16 14:35:32 -05:00
mark_story
2c5d96e916 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
 2014-02-16 14:24:19 -05:00
euromark
1725386c16 Fix uploadError validation rule to work with OS Win. Here the error is string, not integer. 2014-02-12 21:52:18 +01:00
ADmad
2d10707d18 Added regex support to Validation::mimeType(). 2014-01-30 21:05:04 +05:30
euromark
690f54ad9d more corrections in order 2014-01-10 00:33:27 +01:00
mark_story
99e4dbd827 Merge branch 'master' into 2.5 2013-12-23 11:58:07 -05:00
mark_story
62e89734ab Throw exceptions from Hash::combine() 
When the key + value counts do not match Hash should throw an exception.
Silently doing the wrong thing is generally not a good idea. While this
change could break existing applications, those applications were
probably behaving incorrectly anyways.

Fixes #2470
 2013-12-21 17:46:05 -05:00
José Lorenzo Rodríguez
60d2ece035 Merge pull request #2506 from dereuromark/2.5-string 
Correct tokenize for empty strings.
 2013-12-21 10:31:52 -08:00
mark_story
7e5c0f7185 Merge branch 'master' into 2.5 2013-12-20 14:15:35 -05:00
euromark
3ecce19732 Correct tokenize for empty strings. 2013-12-19 15:58:08 +01:00
ADmad
8a666fb37e Don't throw exception when trying to encrypt falsey value. 2013-12-15 19:28:56 +05:30
mark_story
e15d1652ed Relax the 'my' and 'ym' date validation formats. 
All other formats that include 'y' allow 2006 or 06. These formats are
now conformant with the other formats available.

Closes #2436
 2013-12-14 23:02:12 -05:00
mark_story
c2b8778ce8 Merge branch 'master' into 2.5 2013-12-14 17:45:49 -05:00
mark_story
79701af501 Make Hash::numeric() accept more numeric things. 
Negative numbers and other stringy forms of numbers should be accepted.
The name Hash::numeric implies is_numeric which it now uses.

Fixes #2478
 2013-12-12 17:41:38 -05:00
Jose Lorenzo Rodriguez
fc6edf4d9c Fixed small coding standard error 2013-12-12 09:07:00 +01:00
mark_story
edcfe2d3a8 Add tests for #2433 2013-12-09 12:17:25 -05:00
mark_story
430ef88118 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/VERSION.txt
 2013-11-25 23:15:15 -05:00
mark_story
37e387fed2 Replace non-breaking spaces with Inflector::slug(). 
Fixes #2363
 2013-11-22 10:13:10 -05:00
ADmad
dda6080579 Merge branch 'master' into 2.5 2013-11-19 00:27:12 +05:30
mark_story
cee2801700 Add 'metadata' to the uninflected list. 
Fixes #2332
 2013-11-15 21:49:05 -05:00
Marc Würth
7cfa0116f4 Removed "PHP 5" from file header DocBlocks 
This statement does not serve a purpose anymore.
In a long forgotten world it indicated the main version number of PHP which the code in the file was compatible to.
http://pear.php.net/manual/en/standards.sample.php
But since PHP 5.1 and later this is only marginally true.
Thus I propose to remove it from CakePHP.
 2013-11-13 22:58:39 +01:00
Marc Würth
ce47890e98 Replaced all remaining license references to the Open Group Test Suite License with the MIT License 2013-11-13 18:52:06 +01:00
mark_story
3c1f775ab2 Merge branch 'master' into 2.5 2013-11-09 09:37:27 -05:00
mark_story
ada0ec4c77 Fix formatting of decimal values when there is no fractionSymbol. 
When a currency format does not include a fractionSymbol it should be
able to format fractional values.

Fixes #2253
 2013-11-09 09:36:38 -05:00
davidsteinsland
94998763a5 Fixing whitespace 2013-10-31 23:58:52 +01:00
davidsteinsland
e68a61c375 Added configurable default value to Hash::get() 2013-10-31 23:31:48 +01:00
Mark Story
d6f5f2f0bb Merge pull request #2244 from dereuromark/2.5-debugger 
Pass depth through for Debugger::dump().
 2013-10-30 11:26:28 -07:00
euromark
fecbef5949 Pass depth through for Debugger::dump(). 2013-10-30 18:31:48 +01:00
ADmad
d9ca148499 Merge branch 'master' into 2.5 
Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Model.php
	lib/Cake/VERSION.txt
 2013-10-30 02:34:09 +05:30
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
euromark
4048c686b7 coding standards 2013-10-25 19:29:33 +02: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
mark_story
935a51c892 Add tests for curve<->curves 
Closes #2148
 2013-10-17 12:10:49 -04:00
mark_story
5c8eb5c5a7 Add test cases for pluralization/singularlization of quota. 
Closes #2077
 2013-10-15 17:48:26 -04:00
mark_story
5a394c379a Merge branch 'master' into 2.5 2013-10-14 22:57:50 -04:00
euromark
afb6471128 Make tests pass on win. 2013-10-14 23:59:14 +02:00
euromark
ed2054f4f2 Allow international domains to pass validation. Fixes #1763 2013-10-13 23:43:29 +02:00
Jose Lorenzo Rodriguez
df549898ad Merge remote-tracking branch 'origin/2.5' into k-halaburda-master 2013-10-12 01:05:02 +02:00
mark_story
5aa8a458b1 Update UUID pattern to accept the 'nil' UUID. 
Fixes #4133
 2013-10-10 21:11:55 -04:00
euromark
7b57df5554 Correct method names and missing parent calls. 2013-10-07 20:24:28 +02:00
mark_story
60b0893c79 Merge branch 'master' into 2.5 2013-10-06 23:49:32 -03:00
Bryan Crowe
b9003e5f7c Allow Folder::addPathElement() to accept arrays, also corrected docblock 2013-10-02 22:45:22 -04:00
Renan Gonçalves
a73e926467 Make String::wrap() unicode aware. Solves #3981. 2013-10-01 22:35:11 +02:00
mark_story
cc5795c67d Merge branch 'master' into 2.5 2013-09-26 10:07:10 -04:00
Mark Story
ce9f547175 Merge pull request #1655 from dereuromark/2.5-inlist-clean 
2.5 inList(), multiple() and case sensitivity
 2013-09-25 11:45:29 -07:00
Bryan Crowe
3e05ab897c Missed a couple instanceOf asserations 2013-09-24 22:12:51 -04:00
Bryan Crowe
9a1170cd2b Replaced true asserations with instanceOf asserations in test cases 2013-09-24 22:10:36 -04:00
Bryan Crowe
7d7954ce18 Replaced all is_a() calls with instanceof operator 2013-09-24 21:08:06 -04:00
euromark
f7e507145c Case insensitive validation inList option. Resolves ticket 3521. Added two tests to proof the faulty behavior of $strict here. Also address the faulty behavior in multiple() and replace it with case sensitivity. 2013-09-24 02:01:50 +02:00
mark_story
d2577fac60 Merge branch 'master' into 2.5 2013-09-21 20:01:50 -04:00
mark_story
a30f861f2c Use array_key_exists instead of isset() 
This allows contains() to work with null values.

Fixes #4083
 2013-09-19 21:44:09 -04:00
euromark
17bd465cae simplify tests 2013-09-19 00:17:21 +02:00
mark_story
a7a6fcae8a Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/VERSION.txt
 2013-09-17 10:11:24 -04:00
euromark
382f75dbfc cs corrections, bool to boolean and int to integer. 2013-09-17 14:44:34 +02:00
mark_story
7379d32b59 Simplify & fix phone number validation. 
The changes made in fa3d4a0bb5 tightened
the area code validation too much and excluded at least one valid area
code. This change replaces that with a more generic solution that does
not attempt to exclude non-allocated but potentially valid area codes.

Fixes #4066
 2013-09-13 23:05:40 -04:00
mark_story
f22c4cf90b Merge branch 'master' into 2.5 2013-09-05 10:21:41 -04:00
Rob McVey
7f44cc01b5 Plural of breif is breifs not breives 2013-09-04 09:20:32 +01:00
mark_story
4c92cdcada Reorder inflection rules. 
Place rules for words like 'archives' and 'relatives' before words like
'knives'.

Fixes #4040
 2013-09-03 12:50:02 -04:00
mark_story
59bb05b433 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/VERSION.txt
 2013-09-02 11:35:09 -04:00
mark_story
95ad5f5c78 Add hmac to encrypted data. 
Using an HMAC ensures that the ciphertext has not been
modified.
 2013-08-29 14:40:01 -04:00
mark_story
b8320fdbb7 Load helpers at View construction. 
Loading helpers earlier in View's lifecycle allows for the removal of
many duplicated code segments and a now useless property. It slightly
modifies how View behaves in a test case, but that issue is easily
remedied by calling loadHelpers() a second time.

This primarily fixes issues where helpers may not be loaded in View
subclasses if they override any of View's methods. This is particularly
problematic when aliased helpers are involved.

Refs #4030
 2013-08-28 12:27:07 -04:00
mark_story
c5092851d1 Fix compatibility with PHP 5.2 2013-08-27 23:03:08 -04:00
mark_story
215d43eb06 Add encrypt() and decrypt() methods. 
These methods use AES-256 and provide a simple to use API with easy to
remember names.
 2013-08-27 21:20:22 -04:00
Chen Cohen
a0014e7a30 Ticket 4011 - Adding matchers support for Hash::remove() and Hash::insert() 2013-08-24 02:02:01 +03:00
mark_story
0f2d59d987 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Network/CakeResponse.php
	lib/Cake/TestSuite/CakeTestCase.php
 2013-08-18 23:10:08 -04:00
Phally
524aaf3449 Makes PHPCS pass again. 2013-08-18 16:12:23 +02:00
mark_story
a140b30435 Add a test for Hash::sort() 
Closes #3956
 2013-08-17 17:16:33 -04:00
euromark
6a14f37b74 a few more orders in test case corrected 2013-08-16 20:55:17 +02:00
mark_story
3244b9e3d7 Merge branch 'master' into 2.4 2013-08-16 14:47:01 -04:00
ADmad
8428928fd6 Merge pull request #1528 from mvdriel/caketime-fix 
Added workaround for strtotime("0000-00-00 00:00:00") returning -6216995...
 2013-08-15 10:55:03 -07:00
Mark van Driel
1595287290 Added workaround for strtotime("0000-00-00 00:00:00") returning -62169955200 on a 64 bit system 2013-08-15 08:58:05 +02:00
Frank de Graaf
33f7de0072 Merge pull request #1520 from mvdriel/cakenumber-fix 
Cakenumber fix
 2013-08-14 13:41:53 -07:00
Mark van Driel
559fb5805b Fix formatting with locales using , as decimal separator 
No double number formatting for readable size

Fixed testPrecisionLocalized for travis (when locale is missing?)

Switched locale to nl_NL and fixed test

Skip test when locale is not available
 2013-08-14 22:19:38 +02:00
Phally
6f74e1958b Makes the locale test not always pass, be verbose when it is skipped. 2013-08-14 21:00:31 +02:00
mark_story
26769edd04 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Utility/CakeTime.php
	lib/Cake/VERSION.txt
 2013-08-12 14:39:02 -04:00
ankr
1cb41294b8 Making CakeTime display 'about X ago' when time passed is lower than accuracy 
Removing unnecessary else

Also support 'about' times for future times

Make 'about' times translateable in all languages
 2013-08-12 10:01:38 -04:00
José Lorenzo Rodríguez
789400ac44 Merge pull request #1409 from cdburgess/phone-validation-update 
Phone validation update
 2013-08-11 14:37:05 -07:00
Jose Lorenzo Rodriguez
9d07fc4330 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Console/ShellDispatcher.php
	lib/Cake/Utility/CakeNumber.php
	lib/Cake/View/Elements/sql_dump.ctp
 2013-08-11 23:31:10 +02:00
euromark
e7e5f46916 prevent rtrim to remove whitespace from test 2013-08-08 01:14:31 +02:00
euromark
1339a9dfe1 coding standards according to new sniffer rules 2013-08-08 01:03:21 +02:00
Tigran Gabrielyan
2150e8dce5 Added case for unknown type. Fixes #3966 2013-08-06 18:30:00 -07:00
Mark Story
33af7e2e52 Merge pull request #1426 from dereuromark/2.4-currency-fraction 
Fix currency output for fraction values.

Fixes #1329
 2013-08-06 18:19:01 -07:00
euromark
ad6fcd43d7 Fix currency output for fraction values using fractionExponent option. 2013-08-07 00:36:37 +02:00
ADmad
38b050a711 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
 2013-08-04 19:26:55 +05:30
Marc Würth
1cac1846a3 Added missing calls to setUp & tearDown in tests 2013-07-29 01:52:39 +02:00
mark_story
7b5122adb1 Fix pluralization of Objective. 
Fixes #3921
 2013-07-17 10:04:29 -04:00
euromark
22d6625872 fix test 2013-07-17 12:18:06 +02:00
euromark
13ee5b7338 ability to provide custom strings for timeAgoInWords() 2013-07-16 15:16:30 +02:00
Christian Winther
532b2099e5 Merge pull request #1410 from Phally/2.x-3814 
LH#3814 CakeNumber::toPercentage() should return percentage
 2013-07-15 10:44:41 -07:00
ADmad
d161b21ae1 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Controller/Component/AuthComponent.php
 2013-07-14 10:58:55 +05:30
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
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
Phally
e35bd80dfb Adds option to multiply decimal percentages. Fixes #3814 2013-07-10 14:37:57 +02:00
Charles Burgess
fa3d4a0bb5 Updating the phone validation routine. 
According to NANPA, there are area codes and exchanges that are invalid or reserved and not available for assignment. This would make those phone numbers invalid. For example:

- area-codes: 555, N11, N9X, 37X, 96X
- exchanges: N11
- numbers: 555-0100 thru 555-0199

You could also say 555-1212 is invalid as it is assigned as information for the US.

I changed the tests where 555 as an area code was being used as the assertion will give it a false on the area code and not the exchange as intended.
 2013-07-09 09:54:18 -06:00
ADmad
4ded269549 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
	lib/Cake/VERSION.txt
 2013-07-07 12:22:12 +05:30
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
mark_story
cd3c54bb9d Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/VERSION.txt
 2013-06-10 22:12:10 -04:00
euromark
42777b7809 incorrect tab to space - whitespace coding standards 2013-06-09 21:01:01 +02:00
euromark
4518624187 more whitespace coding standard corrections 2013-06-09 17:39:48 +02:00
euromark
a6f065e7a2 coding standards whitespace and single quote 2013-06-09 17:20:08 +02:00
ADmad
636cc8c103 Merge branch 'master' into 2.4 2013-06-09 18:08:32 +05:30
Aymeric Derbois
0cfdb87cdf Fix a problem of tag values which is not taken into account 
(when equal to zero) when passing an array to XML object.
 2013-06-09 00:52:06 +02:00
mark_story
e527eab5aa Add missing call to parent::setUp() 2013-06-08 09:47:46 -04:00
Mark Story
5cdd11cb38 Merge pull request #1336 from djbobke/caketimetest-locale 
Fix locale for CakeTimeTest when configured different locale in app
 2013-06-08 06:45:20 -07:00
Rik van der Heijden
0946a7799a Fix locale for CakeTimeTest when configured different locale in app 2013-06-08 10:25:28 +02:00
euromark
394bf1054d remove name attribute where not necessary, clean up doc blocks 2013-06-08 04:29:08 +02:00
ADmad
3303a2cda1 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Console/Templates/skel/Config/Schema/db_acl.php
	lib/Cake/Console/Templates/skel/Config/Schema/i18n.php
	lib/Cake/Console/Templates/skel/Config/Schema/sessions.php
	lib/Cake/Console/Templates/skel/Config/acl.ini.php
	lib/Cake/Console/Templates/skel/Config/acl.php
	lib/Cake/Console/Templates/skel/Config/bootstrap.php
	lib/Cake/Console/Templates/skel/Config/core.php
	lib/Cake/Console/Templates/skel/Config/database.php.default
	lib/Cake/Console/Templates/skel/Config/email.php.default
	lib/Cake/Console/Templates/skel/Config/routes.php
	lib/Cake/Console/Templates/skel/Console/Command/AppShell.php
	lib/Cake/Console/Templates/skel/Console/cake.bat
	lib/Cake/Console/Templates/skel/Console/cake.php
	lib/Cake/Console/Templates/skel/Controller/AppController.php
	lib/Cake/Console/Templates/skel/Controller/PagesController.php
	lib/Cake/Console/Templates/skel/Model/AppModel.php
	lib/Cake/Console/Templates/skel/View/Errors/error400.ctp
	lib/Cake/Console/Templates/skel/View/Errors/error500.ctp
	lib/Cake/Console/Templates/skel/View/Helper/AppHelper.php
	lib/Cake/Console/Templates/skel/View/Layouts/Emails/html/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/ajax.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/default.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/error.ctp
	lib/Cake/Console/Templates/skel/View/Layouts/flash.ctp
	lib/Cake/Console/Templates/skel/View/Pages/home.ctp
	lib/Cake/Console/Templates/skel/index.php
	lib/Cake/Console/Templates/skel/webroot/index.php
	lib/Cake/Console/Templates/skel/webroot/test.php
 2013-06-02 18:03:59 +05:30
Marc Würth
4c9f0414cb Improved the DocBlocks and other code cleanup 
Fixed @license tag, url comes first
Whitespace and other minor code cleanup
Added some docblocks
 2013-05-31 00:11:19 +02:00
Marc Würth
2bbd391972 Synced PHP version annotations 
CakePHP seems to be just "PHP 5" as opposed to the PEAR header comment standard "PHP version 5"
http://pear.php.net/manual/en/standards.header.php
 2013-05-29 20:19:14 +02:00
mark_story
cce9e84907 Merge branch 'master' into 2.4 2013-05-28 22:40:32 -04:00
mark_story
7334643b55 Fix issues with getting Xml as SimpleXmlElement and invalid Xml. 
Fixes #3855
 2013-05-27 13:22:14 -04:00
ADmad
fb86859585 Merge branch 'master' into 2.4 2013-05-19 14:37:41 +05:30
euromark
97c2cb367d CS fixes 2013-05-17 10:36:17 +02:00
mark_story
df872dde28 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/VERSION.txt
 2013-05-10 21:58:48 -04:00
Mark Story
94ff1b20e2 Merge pull request #1276 from aymericderbois/2.3-XmlFixZeroValueProblem 
Fix bug in Xml::_toArray Method
 2013-05-07 19:03:18 -07:00
Derbois Aymeric
ca6612bc8b Fix a problem of tag values which is not taken into account 
(when equal to zero) when passing an XML object to an array.
 2013-05-08 00:56:17 +02:00
ADmad
a10275fb8b Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
 2013-05-05 14:36:46 +05:30
mark_story
2b0e10eebb Exclude domain names starting with - 
Related to 479aefc438

Refs #3414
 2013-04-29 21:31:30 -04:00
spiliot
dbe90cae71 removed duplicate test case 
```$this->assertFalse(Validation::money('text'));```
is now tested only once
 2013-04-29 00:20:35 +03:00
spiliot
2d7f6fc707 Added tests 2013-04-22 03:42:19 +03:00
ADmad
79ad8ab95a Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Utility/File.php
 2013-04-14 00:05:18 +05:30
ADmad
ba56fb7064 Fixed issue where incorrect cached filesize was reported when appending to file. 2013-04-13 19:45:20 +05:30
mark_story
8bd1980dd4 DateTime::getTimestamp() is PHP5.3+ 2013-04-11 13:39:05 -04:00
mark_story
5c83bc177d Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Model/Model.php
	lib/Cake/VERSION.txt
 2013-04-09 22:09:56 -04:00
mark_story
0e646a2a4d Fix incorrect timestamp values when using fromString() 
When using fromString() on DateTime objects that were in the global
timezone, an incorrect value would be returned.

Fixes #3743
 2013-04-09 21:30:20 -04:00
mark_story
d28c2f8e72 Fix code & tests for isPast() and isFuture() 
The methods and tests now follow coding standards and work.
 2013-03-30 22:24:14 -04:00
Roberto Frega
632c4feb5d Adds two new time testing methods: 'isFuture' and 'isPast' 
TestCases included
 2013-03-30 22:24:08 -04:00
mark_story
041c2d289f Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Console/Shell.php
 2013-03-26 20:31:54 -04:00
euromark
3a1ff36d5e correct coding standards 2013-03-25 13:06:38 +01:00
mark_story
5d6a6fa203 Fix error when generating Xml. 
Fix warnings/un-escaped entities with deeply nested elements.

Fixes #3718
 2013-03-21 21:12:21 -04:00
mark_story
83de70efcf Tighten Canadian postal code validation. 
D, F, I, O, Q, U should not be valid anywhere in a canadian postal code.

Fixes #3708
 2013-03-17 18:14:56 -04:00
mark_story
e97b3acebb Merge branch 'master' into 2.4 2013-03-14 20:54:42 -04:00
mark_story
246c09ae40 Allow character classes in attribute patterns. 
Fixes #3706
 2013-03-14 12:55:03 -04:00
Yuya Takeyama
14c81fe052 Fix alphaNumeric validation 2013-03-14 20:10:17 +09:00
Ceeram
f6477d58df change formatOutput option name to pretty 2013-03-13 15:44:59 +01:00
Ceeram
fc34d9fe7f Add formatoutput option to Xml::fromArray 2013-03-13 13:07:36 +01:00
euromark
f633241775 fix spacing error 2013-03-10 18:26:58 +01:00
euromark
a9bbaed3d6 fix coding standards 2013-03-10 18:11:50 +01:00
euromark
eb874f87a3 Top 6 world currencies and make them utf8 per default 2013-03-06 23:35:18 +01:00
mark_story
00edc594bf Fix failing test. 2013-02-28 21:31:09 -05:00
mark_story
d1c88ebf8a Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Log/Engine/FileLog.php
	lib/Cake/Utility/Validation.php
	lib/Cake/View/Helper/HtmlHelper.php
 2013-02-24 20:24:26 -05:00
Marc Würth
33fbace4c7 Added 'ym'- & 'y'-date validation 
Added regex in validation
Added tests analog to 'my'-date validation tests, extended the new tests even further
 2013-02-15 14:35:20 +01:00
euromark
111366d5c8 == to === and != to !== where applicable 2013-02-12 03:38:08 +01:00
mark_story
974ac44fb4 Use random iv values in rijndael. 
Using fixed iv values has a number of known problems like dictionary
attacks against the cipher key. Use a random iv value for all future
encrpyted values. Provide backwards compatibility for values encrypted
with fixed iv's, and silently upgrade values for enhanced security.
 2013-02-09 20:48:27 -05:00
ADmad
431e610317 Fix broken tests 2013-02-08 19:04:41 +05:30
Graham Weldon
66d856d883 Added extra line for referencing license file for copyright 2013-02-08 21:22:51 +09:00
Graham Weldon
7b860debe4 This commit is dedicated to Mark Story, who has put in much dedicated time and effort into CakePHP over the years. 
I just wanted to ruin his evening, because this change needs to be merged into CakePHP 3.0.
 2013-02-08 20:59:49 +09:00
mark_story
4af6039107 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Model/Model.php
 2013-01-26 21:16:26 -05:00
Majna
5250c92635 Fix Hash::sort() 'natural' type fallback on PHP < 5.4 2013-01-25 01:07:45 +01:00
Ceeram
16be9d4990 remove unused local vars 2013-01-23 17:22:06 +01:00
mark_story
0cdef75060 Fix failing tests. 
I have no idea why the updated session test was expected to fail as the
data was written to the session.

Refs #3551
 2013-01-21 21:13:35 -05:00
mark_story
75495705a6 Fix Hash::get($data, '0') 
Fixes #3555
 2013-01-21 20:50:46 -05:00