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
Kyle Robinson Young
99793fd654
Test case compatibility skipUnless() to markTestSkipped()
2011-11-16 21:07:09 -05:00
Kyle Robinson Young
98f03dc6df
Replacing test case compatibility functions
2011-11-16 21:07:08 -05:00
Marko Marković
4e702b2fae
Updated test for debug
...
It now detects being called from CLI
2011-11-05 10:24:46 +01:00
Marko Marković
c7363bb042
Updated tests for debug()
2011-11-04 19:43:43 +01:00
mark_story
adf52235d0
Make h() not puke when objects are passed in.
...
This can happen in the default Exception rendering,
if an object is in the viewVars.
2011-10-27 21:30:50 -04:00
mark_story
ca078d9a25
Converging on 4px for border-radius.
...
Updating debug() to output a tiny bit more HTML so it can be made sexy.
2011-09-03 10:06:01 +01:00
Jose Lorenzo Rodriguez
cfd2d9e00b
Updating all @package annotations in doc blocks
2011-07-26 01:46:14 -04:30
Juan Basso
192812ee7f
Updating the copyright to 2011.
2011-05-30 22:32:43 -04:00
Juan Basso
aacb921695
Pattern to use skipIf in tests.
2011-05-30 20:51:36 -04:00
Renan Gonçalves
438050dcaa
Adding 'public' visibility to all public methods.
2011-05-30 22:02:32 +02:00
AD7six
0a53242e3e
correcting all the inverted assertEqual tests
...
$expected is the first argument. Now certain test results start to make
sense:
1) MultibyteTest::testUsingMbStrtolower
Failed asserting that two strings are equal.
--- Expected
+++ Actual
@@ @@
-ႠႡႢႣႤႥႦႧႨႩႪႫႬႭႮႯႰႱႲႳႴႵႶႷႸႹႺႻႼႽႾႿჀჁჂჃჄჅ
+ⴀⴁⴂⴃⴄⴅⴆⴇⴈⴉⴊⴋⴌⴍⴎⴏⴐⴑⴒⴓⴔⴕⴖⴗⴘⴙⴚⴛⴜⴝⴞⴟⴠⴡⴢⴣⴤⴥ
2011-05-17 00:49:00 +02:00
AD7six
afa8f6b441
remove LIBS constant
...
libs always means the Cake lib - so use the CAKE constant
2011-05-15 18:29:52 +02:00
Jose Lorenzo Rodriguez
cee46f5ee3
Fixing debug tests
2011-05-15 00:22:39 -04:30
Jose Lorenzo Rodriguez
7ba60ff424
Changing more paths
2011-05-13 03:15:04 -04:30
Jose Lorenzo Rodriguez
900dfef2f7
Starting unification of casing in remaining folders
2011-05-13 01:53:49 -04:30
