Commit graph

16862 commits

Author SHA1 Message Date
Tounu
e4c47f87dd Creation of a method to parse fixture path
Creation of `_parseFixturePath`
2014-03-11 20:55:46 +01:00
Tounu
9078f350bd Merge pull request #2 from Tounu/patch-3
Allow sub-directories for Fixture folder
2014-03-11 20:13:15 +01:00
Tounu
316fd50443 Allow sub-directories for Fixture folder
Allow sub-directories for Test/Fixture folder (for app. and plugin.)
The directory separator is '/'.
A file ``MyClassFixture.php` in the folder `Fixture/MyFolder` will be included like this :
`'app.MyFolder/my_class'`
2014-03-11 20:12:52 +01:00
Mark Oberemk
8a8d2697d1 Allow chaining in the addCrumb method
For convenience I think it might be valuable to allow addCrumb (and possibly other similar functions) to return $this to permit chained calls such as this:

    $this->Html->addCrumb('Admin', '/admin')->addCrumb('Blogs', '/admin/users')->addCrumb('Add');

as opposed to the considerably more verbose version that needs to be used now:

    $this->Html->addCrumb('Admin', '/admin');
    $this->Html->addCrumb('Blogs', '/admin/users');
    $this->Html->addCrumb('Add');

I'm not sure if this violates some API conventions for helpers but it does seem rather more convenient to work with to me.
2014-03-11 10:37:47 -04:00
mark_story
c0ac61117e Only sort the keys once per request instead of on each match.
Sorting the keys property by value sorts keys with the same prefix for
free. This does change the order of the keys, but I don't think that is
actually a large issue as it is just a list.

Refs #2991
2014-03-10 21:42:26 -04:00
Mark Story
0c207dba4b Merge pull request #2991 from mikegibson/route_params
Fixed incorrect replacement of route elements beginning with same string
2014-03-10 21:28:38 -04:00
Mark Story
47900c10ca Merge pull request #2995 from tharlinsmith/ticket-2994
#2994, unnecessary calls to Model::__isset(null)
2014-03-10 15:53:17 -04:00
Mike Gibson
0de1307110 Changed if statement to force Travis rebuild 2014-03-10 18:46:28 +00:00
Thomas Smith
4927cf6901 #2994, unnecessary calls to Model::__isset(null) 2014-03-10 10:16:32 -07:00
Mike Gibson
60319832b5 Fixed PHPCS error 2014-03-10 15:28:00 +00:00
Mike Gibson
7205f5ec9c Made it slightly neater 2014-03-10 15:01:52 +00:00
Mike Gibson
d40452b43d Test if keys are empty before sorting 2014-03-10 14:25:28 +00:00
Mike Gibson
9be789d371 Use array_keys instead of array_flip 2014-03-10 13:29:43 +00:00
Mike Gibson
17652575f3 Fixed key sorting 2014-03-10 13:09:19 +00:00
Mike Gibson
5e896aa94a Removed comparison method 2014-03-10 13:03:04 +00:00
Mike Gibson
1202658396 Added a test case 2014-03-10 12:03:04 +00:00
Mike Gibson
00956110f5 Sort route keys in reverse length order before replacing to prevent incorrect matching 2014-03-10 11:43:28 +00:00
José Lorenzo Rodríguez
5b7c3d68f0 Merge pull request #2988 from kp2356/patch-1
Documentation correction
2014-03-10 10:10:36 +01:00
Kunal Panchal
a77a0f76a1 Documentation correction
TimeHelper::$niceFormat to CakeTime::$niceFormat
2014-03-10 14:05:03 +05:30
Mark Story
ff7061b09a Merge pull request #2971 from steinkel/feature/improve-set-docblock
fixing Set docblocks
2014-03-08 07:50:39 -05:00
Jorge González
4d51092259 fixing Set docblocks 2014-03-08 10:26:03 +00:00
Mark Story
3cfdf3cc31 Merge pull request #2967 from steinkel/feature/improve-set-docblock
improving docblock for Set::extract and Set::classicExtract return types
2014-03-07 17:21:04 -05:00
Jorge González
6049009cac improving docblock for Set::extract and Set::classicExtract return types 2014-03-07 19:33:02 +00:00
Rachman Chavik
aa0f1c1862 Fix: Stray [] syntax in php 5.3 codebase 2014-03-07 09:23:06 +07:00
Rachman Chavik
e71d650ade Fix: Regression with format specifiers in i18n methods
Refs: #2589
2014-03-07 09:22:56 +07:00
mark_story
6c3bc48ce0 Merge branch 'master' into 2.5 2014-03-06 17:45:00 -05:00
Mark
3ca338fe26 Merge pull request #2781 from davidsteinsland/2.5
Fixed HTTP Status code when ajaxLogin is set
2014-03-06 12:37:51 +01:00
ovidiupruteanu
7b1086e632 Add missing spaces 2014-03-06 05:18:31 +02:00
ovidiupruteanu
56a3f093a1 Sqlserver->describe failing for models with a schemaName
When models have a schemaName set it was searching for TABLE_NAME = 'schema_name.table_name'.
Instead it should search for TABLE_NAME = 'table_name' AND TABLE_SCHEMA = 'schema_name'
2014-03-06 04:54:03 +02:00
Mark Story
8b1e5e31c7 Merge pull request #2925 from ndm2/invocation-verification-fix
Fix verification of expected invocations
2014-03-04 22:54:54 -05:00
mark_story
5544fcc4c2 Merge branch 'master' into 2.5
Conflicts:
	lib/Cake/VERSION.txt
2014-03-03 21:20:58 -05:00
Lucas Freitas
b522b1e724 Entire UL element was being outputted directly (escaped), added to the unset list and fixed 2014-03-03 05:28:59 -03:00
Lucas Freitas
d4b91166bc Fixing stupidity and adding the PHPDoc param 2014-03-03 05:10:21 -03:00
Lucas Freitas
7096495943 Allow the passing parameter escape of the getCrumbList method and reflecting that into the outputted link too 2014-03-03 05:01:49 -03:00
José Lorenzo Rodríguez
1410910dfa Merge pull request #2939 from bcrowe/hotfix-missing-semi-colon
Add missing semi-colon, fixes #2937
2014-03-03 08:31:57 +01:00
Bryan Crowe
003d1a6d47 Add missing semi-colon, fixes #2937 2014-03-03 01:03:56 -05:00
mark_story
549908738b Include the last error if available when sending with mail() fails.
When sending email using mail() include the last error if available.

Fixes #2910
2014-03-02 21:07:25 -05:00
Mark Story
e89081a3ce Merge pull request #2928 from h4ck3rm1k3/master
adding in simple doc for db_acl
2014-03-02 12:59:22 -05:00
ndm2
1015b38a27 Use convenience methods to create a (case-insensitive) negation matcher 2014-03-02 17:56:35 +01:00
James Michael DuPont
316def45cb adding in simple doc for db_acl 2014-03-02 10:25:47 -06:00
Mark Story
c6355651cf Merge pull request #2929 from Marlinc/patch-1
Added the Limburgish language
2014-03-02 09:41:48 -05:00
Marlin Cremers
5795111391 Moved Limburgish to correct the order 2014-03-02 14:30:26 +01:00
Marlin Cremers
7ab028e9d7 Added the Limburgish language 2014-03-02 10:40:39 +01:00
mark_story
a17345cb92 Update build.xml file so PEAR packages include Fixtures. 2014-03-01 21:32:36 -05:00
mark_story
45cabd40fe Update version number to 2.4.6 2014-03-01 21:22:04 -05:00
ndm2
70a1b87db6 Fix wrong test model association class name 2014-03-01 23:01:33 +01:00
ndm2
01e1b5ca61 Fix failing tests caused by already existing classes 2014-03-01 20:24:32 +01:00
ndm2
008ad3237c Fix verification of expected invocations #2919 2014-03-01 19:06:17 +01:00
ADmad
a707709e1d Added test for FormHelper::radio().
Tests generating radio input for field with model other than one used
in create(). Refs #2911.
2014-02-28 02:34:16 +05:30
mark_story
706ddfccae Merge branch '2.5' of github.com:cakephp/cakephp into 2.5 2014-02-26 21:09:06 -05:00