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

15286 commits

This branch
This branch
All branches
Author SHA1 Message Date
mark_story
cd3c54bb9d Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/VERSION.txt
 2013-06-10 22:12:10 -04:00
Mark Story
bbcc7b2335 Merge pull request #1343 from Phally/patch-1 
Minor optimization of CakeEmail::_wrap().
 2013-06-10 16:57:34 -07:00
Frank de Graaf
f79a258a64 Minor optimization of CakeEmail::_wrap(). 2013-06-11 00:53:25 +03:00
euromark
6ed85f2d5d doc block 2013-06-10 15:10:32 +02:00
Mark Story
e77d49f554 Merge pull request #1342 from dereuromark/master-coding-standards 
incorrect tab to space - whitespace coding standards
 2013-06-09 20:00:46 -07:00
mark_story
d10df32a44 Update version number to 2.3.6 2013-06-09 22:41:41 -04:00
euromark
42777b7809 incorrect tab to space - whitespace coding standards 2013-06-09 21:01:01 +02:00
Mark Story
dd28b2396d Merge pull request #1341 from dereuromark/master-coding-standards 
Coding standards
 2013-06-09 08:49:49 -07: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
euromark
f6aedea271 coding standards elseif 2013-06-09 17:12:46 +02:00
ADmad
405c5b0280 Fix test 2013-06-09 18:57:09 +05:30
ADmad
636cc8c103 Merge branch 'master' into 2.4 2013-06-09 18:08:32 +05:30
mark_story
e5b1182a0d Only delete files that have a matching group + prefix. 
Fixes #3873
 2013-06-08 22:42:41 -04:00
Mark Story
0f38dbd485 Merge pull request #1338 from aymericderbois/FixErrorWithZeroValueXml 
Fix bug in Xml::_createChild Method
 2013-06-08 17:20:16 -07:00
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
Mark Story
ac5a6ddf8e Merge pull request #1324 from dereuromark/master-test-cases 
remove $name where not necessary
 2013-06-08 06:44:28 -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
Mark Story
b75449df9e Merge pull request #1335 from arnold-almeida/master 
Use error() instead of err() for bevity
 2013-06-07 03:59:44 -07:00
Arnold Almeida
dacf7e0ebe Update FixtureTask.php 
Using err() does not stop shell output when used in the context of a script. 

Also no nice color syntax to indicate that there was an error with one of the fixture generations.

Using error() fixes that.
 2013-06-07 14:21:35 +08:00
Jose Lorenzo Rodriguez
f14c55916f Repeating previous change for SQLite, so it passes on PHP 5.5 2013-06-06 18:12:07 +02:00
Jose Lorenzo Rodriguez
04a6bfbda6 Fixing postgres test for PHP 5.5 2013-06-06 17:55:55 +02:00
Jose Lorenzo Rodriguez
51af8800f2 Rewriting assertion to account for the actual case and not breaking in 
PHP 5.5
 2013-06-06 17:45:52 +02:00
José Lorenzo Rodríguez
3b4a4fde31 Merge pull request #1317 from lorenzo/feature/full-base-url 
Adding App.fullbaseURL as a recognized Configure value
 2013-06-05 15:12:27 -07:00
Jose Lorenzo Rodriguez
10ba4dd773 Fixed CS errors 2013-06-06 00:11:50 +02:00
Jose Lorenzo Rodriguez
7b746ccb57 Overwriting App.fullBaseURL if changed using Router::baseURL() 2013-06-05 23:57:16 +02:00
Mark Story
e26a05ce04 Merge pull request #1235 from ADmad/2.3-caketime 
Fix datetime comparison in relative datetime functions.
 2013-06-05 06:12:50 -07:00
José Lorenzo Rodríguez
2416cab3fb Merge pull request #1329 from ceeram/master-travis 
update travis.yml to test on php 5.5
 2013-06-05 04:23:22 -07:00
Ceeram
4e9fb1f01a update travis.yml to test on php 5.5 2013-06-05 12:26:50 +02:00
ADmad
5d0d5fb96c Merge pull request #1328 from kimegede/typo-fix 
Correct small typos.
 2013-06-05 01:01:28 -07:00
Kim Egede Jakobsen
6c3a63ea9b Correct small typos. 2013-06-05 09:57:18 +02:00
Mark Story
59646aa30a Merge pull request #1326 from fahad19/http-patch 
convenience wrapper for HTTP PATCH in HttpSocket class.
 2013-06-04 20:54:45 -07:00
Fahad Ibnay Heylaal
679177b8f3 convenience wrapper for HTTP PATCH in HttpSocket class. 2013-06-04 22:46:15 +02:00
mark_story
3aa189eb3a Fix cookie expiry time calculation on 32bit systems. 
strtotime() misbehaves on 32bit systems when the resulting timestamp
would overflow an integer. Use a DateTime to workaround this issue.

Fixes #3868
 2013-06-03 20:16:18 -04:00
mark_story
027cfe9496 Fix typo. 2013-06-02 18:12:51 -04:00
ADmad
f3c69c9f40 docblock updates 2013-06-03 01:04:00 +05:30
mark_story
cbf3228c34 Fix inconsistent name/alias usage. 
TranslateBehavior should always use name instead of alias when
creating/updating/saving new translate records. It already uses name
when finding translations and the mismatch was causing translations to
not be found when saved from an aliased model.

Thanks to Joost de Keijzer for providing the initial patch.

Fixes #3865
 2013-06-02 13:50:23 -04:00
Mark Story
a6bc92719a Merge pull request #1321 from zoghal/form-select-disabled 
fix Form::_selectOptions, when disabled attribute is not array so do not...
 2013-06-02 10:14:28 -07: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
Saleh Souzanchi
ca44413689 fix Form::_selectOptions, when disabled attribute is not array so do not be disabled item of options 2013-06-01 14:16:23 +04:30
mark_story
be2a252345 Fix coding standards. 2013-05-31 10:37:20 -04:00
Mark Story
4b7c128f04 Merge pull request #1320 from ravage84/docblock-improvements 
Improved the DocBlocks and other code cleanup
 2013-05-31 07:36:04 -07:00
Mark
525bf3b362 Merge pull request #1297 from dereuromark/master-email-wrapping 
enforce a better email wrapping to send valid emails
 2013-05-31 07:30:32 -07:00
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
Jose Lorenzo Rodriguez
4bc92b822e Adding App.fullbaseURL as a recognized Configure value 2013-05-30 16:07:26 +02:00
Mark Story
07dba8d436 Merge pull request #1316 from sarce/patch-2 
Add 'ssl_allow_self_signed' option to SSL context in HttpSocket class.
 2013-05-30 06:42:10 -07:00
Sebastián Marcos Arce
bf6c3854e5 Update HttpSocketTest.php 
Update tests.
 2013-05-30 10:13:31 -03:00