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

18790 commits

This branch
This branch
All branches
Author SHA1 Message Date
Julius Beckmann
c8a2921b12 Made PHP 5.6 a allowed failure on travis. 2014-05-12 08:42:17 +02:00
Dominik
cd445f2526 Add unix socket support to Redis cache engine 
Refs #3438
 2014-05-11 21:49:32 -04:00
mark_story
d0b995ad79 Merge branch '2.5' into 2.6 2014-05-11 21:47:42 -04:00
ADmad
63ab865174 Add formatting rules for .yml files to editorconfig. 2014-05-11 21:47:10 -04:00
Mark Story
6f08b064a6 Merge pull request #3470 from cuppett/master 
Fixes #3469, explicit isset check for counterCache
 2014-05-11 21:13:55 -04:00
Stephen Cuppett
ed83df5bed Fixes #3469, explicit isset check for counterCache 2014-05-11 19:17:18 -04:00
Julius Beckmann
28404ace96 Added PHP 5.6 to travis. 2014-05-11 22:15:35 +02:00
mark_story
cc49d28ef8 Fix double / in missing component error page. 
Fixes #3466
 2014-05-10 22:02:22 -04:00
mark_story
cd37810b02 Merge branch 'fix-formhelper' 
Fix failing tests on PHP5.2.x
 2014-05-09 17:17:23 -04:00
mark_story
51909ae738 Only parse URLs when they contain :// 
Parsing incomplete URLs fails in PHP5.2.
 2014-05-09 17:01:24 -04:00
euromark
8f0e203fb5 test failed. reverted and corrected doc block instead for BC. 2014-05-08 01:52:48 +02:00
euromark
1caf1cac4b Remove wrong return. 2014-05-08 01:46:08 +02:00
José Lorenzo Rodríguez
751d2d8f2d Merge pull request #3448 from dereuromark/master-controller 
Controller::referer() and local URL
 2014-05-07 22:42:28 +02:00
mark_story
5469840c80 Fix incorrectly generated URL path. 
Refs #3442
 2014-05-07 08:52:42 -04:00
mark_story
1103ca7816 Ensure that only the path and query are used to make the hash. 
While including the entire protocol, host, port, path and query would be
even better in theory, it gets complicated when proxies and load
balancers are involved.

Fixes #3442
 2014-05-06 23:00:11 -04:00
mark_story
559d9d39e7 Make test names match the rest of the tests. 2014-05-06 22:13:44 -04:00
Mark Story
0e37f1bf27 Merge pull request #3445 from renan/2.5-authenticate 
2.5 Allowing same Authenticate object to be setup with different settings
 2014-05-06 17:03:01 -04:00
Renan Gonçalves
87683b10f1 Allowing same Authenticate object to be setup with different settings. 2014-05-06 22:10:41 +02:00
José Lorenzo Rodríguez
23519e1988 Merge pull request #3441 from dakota/patch-1 
Fixes issue with Sql Server driver when loading fixtures
 2014-05-06 13:13:37 +02:00
Walther Lalk
2dd3cecfaa Fixes issue with Sql Server driver when loading fixtures 
Sqlserver::describe is expecting a model object (Unlike other drivers which work with either a object or string). While this does work under normal conditions, it causes a "Trying to get property of non-object" notice when using fixtures. The same problem also causes the testLimitOffsetHack test to fail.

This change does a simple test to ensure that the $model variable is an object before trying to access a property of it. All SqlServer tests are now passing.
 2014-05-06 12:43:36 +02:00
mark_story
4f0845d243 Merge branch '2.5' into 2.6 2014-05-04 22:14:45 -04:00
mark_story
9e06b54ff8 Merge branch 'master' into 2.5 2014-05-04 22:14:33 -04:00
ADmad
ead6c837c8 Add formatting rules for .yml files to editorconfig. 2014-05-04 18:37:41 +05:30
ADmad
aa7f18840c Merge branch '2.5' into 2.6 2014-05-04 14:40:39 +05:30
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
Mark Story
8dcce43d6d Merge pull request #3412 from dereuromark/2.6-overwrite 
Backporting overwrite() from 3.0 to 2.6.
 2014-05-03 20:49:08 -04:00
José Lorenzo Rodríguez
2f0a9be0e4 Merge pull request #3432 from dereuromark/master-hotfix 
Hotfix - For TextHelper
 2014-05-02 14:14:42 +02:00
euromark
57cb7ea260 Correct documentation. 2014-05-02 13:48:39 +02:00
euromark
fecf321cce This is a hotfix for TextHelper which seems to have gone wrong in a merge. tail() is missing completly and the docs for truncate() are the ones for tail(). This fixes it. 2014-05-02 13:33:57 +02:00
José Lorenzo Rodríguez
6c6a6507d5 Merge pull request #3431 from ADmad/2.4-travis 
Fix travis builds.
 2014-05-01 16:33:18 +02:00
ADmad
0c0448fe0b Fix travis builds. 
Travis updated to phpunit 4 for PHP 5.3 and CakePHP needs phpunit 3.7.
 2014-05-01 19:38:59 +05:30
Mark Story
279a86f313 Merge pull request #3427 from thinkingmedia/patch-2 
remove constructor return value.
 2014-04-30 16:43:48 -04:00
Mathew Foscarini
2244e02017 remove constructor return value. 
Not sure why this was here, but constructors shouldn't return a value. Nothing in the docs says that a controller's implementation of appError should return a value either. So I figure this was a mistake.
 2014-04-30 16:25:01 -04:00
ADmad
6f9efbf386 Merge pull request #3426 from thinkingmedia/patch-1 
Grammar fixes
 2014-05-01 01:50:17 +05:30
Mathew Foscarini
f7453500b9 fixed case. 2014-04-30 16:19:15 -04:00
Mathew Foscarini
bb726d58ba Grammar fixes 
@return will accept the `|` or operator to define multiple return types. Don't use the word `or`.
 2014-04-30 16:09:53 -04:00
ADmad
c930bbb0b3 Merge pull request #3421 from thinkingmedia/patch-1 
Removed incorrect usage of @deprecated phpDoc
 2014-04-30 19:27:15 +05:30
Mathew Foscarini
ceab9f185f Removed incorrect usage of @deprecated phpDoc 
@deprecated is flagging the function element as deprecated in all IDE's that support phpDOC tags. There is no phpDoc tag to deprecate a function parameter.
 2014-04-30 09:55:27 -04:00
mark_story
4b5e3c176e Update version number to 2.4.9 2014-04-29 21:52:10 -04:00
mark_story
e1057e3e6b Fix FormHelper::postLink() not working when SecurityComponent is enabled. 
The action attribute value was not being included in the generated hash,
so postLink() forms never worked properly.

Fixes #3418
 2014-04-29 11:23:52 -04:00
Mark Story
1a39917e76 Merge pull request #3416 from dereuromark/master-strict 
More coding standard corrections.
 2014-04-29 09:37:48 -04:00
euromark
7a287a6942 More coding standard corrections. 2014-04-29 14:19:33 +02:00
Mark Story
79ca18492a Merge pull request #3415 from dereuromark/master-strict 
Stricter string comparisons.
 2014-04-29 07:21:25 -04:00
euromark
bd074e7dc7 Stricter string comparisons. 2014-04-29 12:05:47 +02:00
mark_story
1d1a2f859c Fix coding standards error. 2014-04-28 20:56:06 -04:00
euromark
06aa747b21 Merge branch '2.6' of github.com:cakephp/cakephp into 2.6-overwrite 2014-04-29 02:35:20 +02:00
mark_story
a0eb736151 Update version number to 2.4.8 2014-04-28 20:35:20 -04:00
mark_story
5432f834ff Merge branch '2.5' into 2.6 
Conflicts:
	lib/Cake/VERSION.txt
 2014-04-28 20:34:29 -04:00
euromark
5e5a776de8 Backporting overwrite() from 3.0 to 2.6. 2014-04-29 02:18:27 +02:00
euromark
8679c5cd18 Fix test 2014-04-28 17:33:56 +02:00