Juan Basso
c754fb2dcb
Updated copyright to 2012.
2012-03-12 22:46:46 -04:00
Kyle Robinson Young
c4829dc3b8
Use App::RESET instead of true with App::build()
2012-02-18 04:04:54 -08:00
mark_story
27367b491a
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/View/Helper/TextHelperTest.php
lib/Cake/View/Helper/TextHelper.php
2012-02-14 21:55:21 -05:00
Rachman Chavik
5eb1979b04
rename protected variable to $_engine
2012-02-14 23:28:57 +07:00
Rachman Chavik
fe479c636c
adding tests for engine overrides
2012-02-14 23:28:57 +07:00
Vinícius Krolow
07adcfe2f7
fixing regex of autoLinks to work with urls that have www
2012-02-14 11:08:37 -02:00
Rachman Chavik
abd6d22445
changing methods in String class to static
2012-02-14 09:34:36 +07:00
Rachman Chavik
fbd3f87be6
recreating TextHelperTest
2012-02-10 22:26:00 +07:00
Rachman Chavik
59342e0524
moving methods from TextHelperTest to StringTest
2012-02-10 22:26:00 +07:00
mark_story
3478f8a627
Merge branch '2.0' into 2.1
2011-12-30 10:19:51 -05:00
Kyle Robinson Young
acca796d10
Fix tag order when closing open tags with TextHelper::truncate()
2011-12-25 09:10:50 -08:00
Kyle Robinson Young
4e7e06fa9f
Prevent TextHelper::truncate() from breaking HTML
...
Fixes #2397
2011-12-24 21:25:07 -08:00
ADmad
389072708a
Merge branch '2.0' into 2.1
...
Conflicts:
lib/Cake/Test/Case/Model/ModelReadTest.php
lib/Cake/Utility/Debugger.php
2011-12-22 03:15:04 +05:30
Kyle Robinson Young
51f9837db4
Code standards formatting
2011-12-15 22:52:07 -08:00
Rachman Chavik
a88ca54a8d
updating usage of assertEqual -> assertEquals
2011-12-13 21:03:40 +07: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
Kyle Robinson Young
7f22fcdbf5
Fix TextHelper excerpt method to work as documented
...
Fixes #2339
2011-12-05 12:12:09 -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
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
98f03dc6df
Replacing test case compatibility functions
2011-11-16 21:07:08 -05:00
mark_story
bcdf61a9d5
Adding escaping by default for TextHelper::autoLink()
...
TextHelper::autoLink, autoLinkEmails, and autoLinkUrls now all
escape HTML by default, this can be disabled using the escape => false option.
Fixes #1625
2011-10-29 12:08:43 -04:00
mark_story
7f0f224c56
Fix missing preg_quote around highlight searches.
...
Highlight strings should be literal values not regexp fragments.
Fixes #2111
Conflicts:
cake/libs/view/helpers/text.php
cake/tests/cases/libs/view/helpers/text.test.php
2011-10-18 12:19:19 -04:00
mark_story
3b1a11e2d2
Add a test for src and href attributes
...
with TextHelper::autoLinkUrls()
2011-10-10 22:16:10 -04:00
Juan Basso
9bc3e567c1
Removed the @access and @static.
2011-07-30 20:56:48 -04: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
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
Jose Lorenzo Rodriguez
900dfef2f7
Starting unification of casing in remaining folders
2011-05-13 01:53:49 -04:30
