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
17718 commits 7 branches 0 tags 44 MiB
Commit graph

65 commits

Author SHA1 Message Date
mark_story
7c316bbc56 Merge branch 'master' into 2.6 
Conflicts:
	lib/Cake/basics.php
 2014-08-30 21:28:11 -04:00
Mark Story
7a8cb4315e Merge pull request #4366 from hmic/ticket#2707 
Fixed i18n __*() bug
 2014-08-24 17:25:30 +02:00
Hans-Joachim Michl
b4620b4c6c Fixes #2707 
When the first variable argument = null, but there are more arguments given.
Added testcases to show the change (to fail before the fix)
 2014-08-24 14:27:49 +00:00
mathieu strauch
85cd11384a fix failing testLogError 2014-08-24 15:46:44 +02:00
euromark
ac0053d660 Added a shorthand stackTrace() method 2014-07-10 01:49:28 +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
Rachman Chavik
e71d650ade Fix: Regression with format specifiers in i18n methods 
Refs: #2589
 2014-03-07 09:22:56 +07:00
AD7six
5334fe04c3 handle loose % signs in __() function 
While it's passed to sprintf and translation markers may contain
variable placeholders (%s, %d) that doesn't mean translators need to be
aware of all relevant rules. A % sign in a translation message shouldn't
cause a warning (and no return) it should be handled as a literal
percent sign.
 2014-02-13 15:30:16 +00:00
Mark Story
384c3a815d Merge pull request #2350 from tuffz/formatting_app_uses_blocks 
formatting app::uses blocks
 2013-12-14 12:37:02 -08:00
Eric Büttner
1e3865acc7 formatting app::uses blocks (refs #2265) 2013-11-18 11:56:00 +01: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
euromark
e3a3946e89 address casting cs 2013-09-17 15:15:25 +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
mark_story
06cf62aefe Fix failing tests. 
Refs GH-1307
 2013-05-28 22:38:01 -04:00
mark_story
92d215df4d Merge branch 'pr-cli' into 2.4 
From pull request 1142
 2013-02-28 21:23:03 -05:00
mark_story
15d01bf901 Fix tests for cli runner. 2013-02-28 21:22:01 -05:00
euromark
111366d5c8 == to === and != to !== where applicable 2013-02-12 03:38:08 +01:00
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
27d7e2865e Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
	lib/Cake/Network/CakeSocket.php
	lib/Cake/Network/Http/HttpResponse.php
	lib/Cake/Utility/Folder.php
	lib/Cake/View/MediaView.php
	lib/Cake/basics.php
 2012-11-20 23:02:33 -05:00
Ceeram
56225bcca3 fix all warnings except TODO warnings 2012-11-14 12:56:10 +01:00
mark_story
c24bec679b Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/View/Helper/FormHelper.php
 2012-10-27 21:13:53 -04:00
Ber Clausen
a7d9422c09 Test all empty array with assertSame() because assertEquals() does not check the type. 2012-10-26 19:21:51 -03:00
euromark
7bf08fdcc7 default value null makes more sense. add test cases for false. 2012-10-12 16:03:05 +02:00
mark_story
d3105332dc Fix coding standards errors. 2012-09-01 12:14:15 +01:00
mark_story
b32273e713 Fix whitespace errors. 2012-08-04 15:57:04 -04:00
Simon East
1ea457e40e Prevent booleans from being encoded (converted to strings) by h() function, helps prevent accidental fatal errors in some PHP versions around 5.2.9 2012-07-20 12:48:57 +10:00
Ceeram
4c6453501e Merge branch '2.1' into 2.2 2012-06-02 01:47:21 +02:00
Rachman Chavik
483d7124dd debug() may output path that is incorrectly truncated 
This happens when debug is called in core source files that resides in
a different directory to the app.
 2012-06-01 15:28:06 +07:00
Rachman Chavik
907b3221ed logging: fix failing tests when called via webrunner 2012-05-25 23:52:33 +07:00
Rachman Chavik
bb090c54cf changing Shell to use ConsoleLog 2012-05-11 12:37:00 +07:00
Jose Lorenzo Rodriguez
bf0f5ab118 Merge remote-tracking branch 'origin/2.1' into 2.2 2012-04-29 20:05:39 -04:30
Kyle Robinson Young
b8488b8dfe Update 1.x @link in docblocks 2012-04-26 19:49:18 -07:00
mark_story
72c3059d94 Add missing parent calls. 
Fixes piles of failing tests.
 2012-04-15 22:20:34 -04:00
Kyle Robinson Young
90e7afbdc7 Correct parameter order of assertEquals and assertNotEquals 2012-03-22 23:37:12 -07:00
mark_story
480c1bbb54 Fix coding standards. 2012-03-18 18:06:10 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
mark_story
fdcb3dc34f Fix coding standards. 2012-03-10 23:12:08 -05:00
Kyle Robinson Young
c7963835c7 Correct path in debug() 2012-03-05 14:44:45 -08:00
Kyle Robinson Young
22582aee63 Upgrade legacy uses of App::build() types 2012-02-18 04:31:29 -08:00
mark_story
2e8498e166 Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Model/Datasource/Database/Postgres.php
	lib/Cake/Test/Case/Console/TaskCollectionTest.php
	lib/Cake/Test/Case/Model/ModelIntegrationTest.php
	lib/Cake/Test/Case/Utility/ClassRegistryTest.php
	lib/Cake/Utility/ClassRegistry.php
 2011-12-11 22:51:40 -05:00
Kyle Robinson Young
1e1c7a036d Code consistency formatting tweaks 2011-12-06 12:52:48 -08:00
mark_story
6d269ce25d Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Console/Command/TestsuiteShell.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Model/Datasource/Database/Sqlite.php
	lib/Cake/Test/Case/Model/ModelTestBase.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
 2011-12-03 13:45:28 -05:00
Kyle Robinson Young
94e119fe67 Adhere to code formatting standard 2011-11-30 23:21:31 -08:00
mark_story
21cd3f00ac Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Test/Case/BasicsTest.php
 2011-11-19 20:40:07 -05:00
m
2957a33b23 assertEqual to assertEquals in core test files 
Signed-off-by: mark_story <mark@mark-story.com>
 2011-11-19 09:25:03 -05:00
mark_story
2f599e8a2a Removing extra new lines. 
Removing extra new lines and duplicated tests.
 2011-11-16 21:51:49 -05:00
mark_story
fa0ec44dfd Merge branch '2.0' into 2.1 
Conflicts:
	lib/Cake/Test/Case/Console/Command/CommandListShellTest.php
	lib/Cake/Test/Case/Error/ExceptionRendererTest.php
	lib/Cake/Test/Case/Utility/DebuggerTest.php
	lib/Cake/Test/Case/View/Helper/TextHelperTest.php
 2011-11-16 21:31:16 -05:00