adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-24 07:47:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
18518 commits 7 branches 0 tags 44 MiB
Commit graph

359 commits

Author SHA1 Message Date
euromark
26fe1265ab Mark App::pluginPath as deprecated and don't use it anymore. 2014-06-24 11:52:29 +02:00
Mark Story
c99c68684b Merge pull request #3646 from nanapi/no-truncate-fixture 
Don't truncate test fixtures when the table has been freshly created.
 2014-06-18 09:18:24 -04:00
mark_story
d8b0083632 Fix api doc errors in TestSuite/ 2014-06-06 13:57:48 -04:00
akiyan
6d2402fbf6 No truncate when drop table. 2014-06-05 13:37:22 +09:00
mark_story
ab5da2a09f Fix the test suite package doc block errors. 2014-06-05 00:24:01 -04:00
David Yell
140e0bbbd3 Updated the test suite dispatcher to allow use of PHPUnit from Composer 
Closes #3479
 2014-05-14 09:09:53 +07:00
euromark
4f3578ebda Fix CakeHtmlReporter output for HTML 2014-04-12 13:37:36 +02:00
euromark
0ece694a75 microptimize options and default merge and other string key array merges 2014-04-08 01:25:14 +02:00
Jose Lorenzo Rodriguez
343d3279b9 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/Test/Case/Utility/FileTest.php
	lib/Cake/VERSION.txt
 2014-04-06 21:50:41 +02:00
euromark
bbe3b6a439 more cs 2014-04-02 03:09:42 +02:00
mark_story
d713ff2c6a Correct docblock. 
Refs #3147
 2014-03-29 20:19:34 -04:00
Harold Putman
522b5048f8 Expose canUseMemory 
This lets Fixture be used to create an actual persistent table with InnoDB engine instead of MEMORY.
 2014-03-28 09:24:49 -04:00
mark_story
57b8008dbe Merge branch 'master' into 2.5 2014-03-23 11:01:13 -04:00
mark_story
75fcc7c2f8 Don't use count() in a loop. 
Use do while so the count does not happen in a loop statement. This
makes the code linter happier.
 2014-03-23 11:00:59 -04:00
mark_story
8acb75425d Merge branch 'master' into 2.5 
Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Datasource/DboSource.php
 2014-03-21 22:55:28 -04:00
mark_story
a801be30d9 Use alternate quoting in assertTags() 
When a preg pattern contains no `.` it probably doesn't need quote
anchors.
 2014-03-21 22:53:25 -04:00
mark_story
af68f61e7a Make assertTags() run much faster. 
Generating the various permutations a priori is incredibly expensive
with sets of attributes. Using nested loops that look for matches is
more efficient.

Add replacments for `.*` and `.+` in preg:/ prefixed attribute matchers
so they do not greedily eat all content. This also requires that preg:/
based attribute matchers *must* be quoted.

Fixes #3072
 2014-03-21 22:52:52 -04:00
mark_story
a827b96804 Clean up doc blocks for assertTags. 2014-03-21 22:52:52 -04:00
euromark
97c148a170 Correct typo 2014-03-19 12:47:31 +01:00
Tounu
482b90e6b1 Php cs fixed 2014-03-11 21:16:30 +01:00
Tounu
e4c47f87dd Creation of a method to parse fixture path 
Creation of `_parseFixturePath`
 2014-03-11 20:55:46 +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_story
a965903777 Merge branch 'master' into 2.5 2014-02-17 10:51:32 -05:00
mark_story
070b165527 Mark compatibility shims as deprecated. 
Fixes #2845
 2014-02-17 10:29:03 -05:00
mark_story
2c5d96e916 Merge branch 'master' into 2.5 
Conflicts:
	lib/Cake/Model/Datasource/DboSource.php
 2014-02-16 14:24:19 -05:00
mark_story
a5d50da040 Remove dead and unused code. 2014-02-11 16:38:24 -05:00
mark_story
75dd2ff1fb Merge branch 'master' into 2.5 2014-01-16 15:20:40 -05:00
euromark
ecfd64c082 adding test 2014-01-06 21:07:00 +01:00
euromark
865ca7acd6 wording 2014-01-06 20:43:30 +01:00
euromark
1201887ad1 Clearer error message 2014-01-06 20:42:17 +01:00
Stephen Young
f0036b3ebc CakeFixtureManager::load now calls CakeTestFixture::truncate 2013-12-07 09:47:06 -05:00
ADmad
dda6080579 Merge branch 'master' into 2.5 2013-11-19 00:27:12 +05:30
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
Kim Egede Jakobsen
18e0dc95dd Remove @return from docblock (for __construct && __destruct methods) 2013-11-11 14:54:48 +01:00
Kim Egede Jakobsen
f0205f53ad Try to make same comments for constructors. 
Conflicts:
	lib/Cake/I18n/L10n.php
 2013-11-11 11:03:57 +01:00
ADmad
d9ca148499 Merge branch 'master' into 2.5 
Conflicts:
	CONTRIBUTING.md
	lib/Cake/Model/Model.php
	lib/Cake/VERSION.txt
 2013-10-30 02:34:09 +05:30
Bryan Crowe
a943ea5c34 Add space between classname(s) 2013-10-22 22:59:50 -04:00
mark_story
5a394c379a Merge branch 'master' into 2.5 2013-10-14 22:57:50 -04:00
euromark
1cb24ae537 CS fixes using phpcs-fixer auto-correction. 2013-10-12 01:27:00 +02:00
Jose Lorenzo Rodriguez
df549898ad Merge remote-tracking branch 'origin/2.5' into k-halaburda-master 2013-10-12 01:05:02 +02:00
Bryan Crowe
c1dd0e4393 Changed url to URL where appropriate 2013-10-07 23:17:58 -04:00
mark_story
5e9b22271a Merge branch 'master' into 2.5 2013-09-27 22:26:33 -04:00
euromark
df269ba0ef Cake to CakePHP name 2013-09-27 19:36:43 +02:00
euromark
cbbd3ec6b3 correct doc block 2013-09-20 19:31:16 +02:00
euromark
b6a7cb7c7e Output overall coverage. 2013-09-20 19:15:51 +02:00
euromark
959988cfa1 Remove last yoda conditions as per coding standards guidelines. 2013-09-06 18:36:57 +02:00
AD7six
09cf69c452 Pass Controller:$components config to mocked components 
Otherwise there can be significant differences in behavior between using
an unmodifiedcomponent in testAction and using a mock as the config will not be
propogated from the controller
 2013-08-19 10:33:16 +00:00
José Lorenzo Rodríguez
a54c92fc0f Merge pull request #1475 from cakephp/feature/2.4-mock-app-model 
Make mocking random models easier
 2013-08-05 00:22:53 -07:00
ADmad
38b050a711 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Console/Command/ConsoleShell.php
 2013-08-04 19:26:55 +05:30
AD7six
ff856b7ebb bark if the model doesn't exist 
Getting the following warning:

    ReflectionException: Class Mock_Foo_e187b1d1 does not have a
constructor, so you cannot pass any constructor arguments

Is a much less obvious way of saying "the class you're trying to mock
doesn't exist". Be more explicit
 2013-08-03 16:00:34 +00:00
AD7six
46b28aae50 merge config in getMockForModel 
Otherwise, to override just one key, it's necessary to set all the other
defaults too
 2013-08-03 16:00:04 +00:00
Jose Lorenzo Rodriguez
d218313cf5 Removing legacy code that will not work on current versions of phpunit, 
fixes #3955
 2013-08-02 12:24:43 +02:00
Christian Winther
227f9aaa88 Merge pull request #1440 from Phally/master-postgres-fails 
Adds order to the test models to make the results more predictable.
 2013-08-01 02:38:33 -07:00
mark_story
95b74bd9ef Make sure ComponentCollection has the controller dependency. 
Add setter method as changing ComponentCollection's constructor now is
not possible. This fixes issues where components that rely on
Collection->getController() in their constructor can work properly.

Fixes #3946
 2013-07-30 09:09:52 -04:00
Phally
db1876d837 Adds order to the test models to make the results more predictable. 
Even though there was some code in place to prevent results in random
order from PostgreSQL we were still experiencing this with Jenkins
and Travis.

This commit removes the old code that handled this. From now on this
will be handled differently. Every test model will order by its
primary key. You can disable this by changing the order property
of the model to `null`: `$testModel->order = null`.
 2013-07-19 22:31:09 +02:00
ADmad
4ded269549 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Controller/Component/Auth/BlowfishAuthenticate.php
	lib/Cake/VERSION.txt
 2013-07-07 12:22:12 +05:30
euromark
c989624f80 whitespace coding standards 2013-07-05 14:15:18 +02:00
mark_story
c597855fe4 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Test/Case/Network/CakeRequestTest.php
 2013-07-03 14:21:09 -04:00
euromark
a90cb29c0f simplify else cases 2013-07-03 01:14:41 +02:00
euromark
7cb19b97db coding standards and simplification of else cases as well as some minor fixes 2013-07-03 00:52:48 +02:00
mark_story
f09693f6e8 Merge branch 'master' into 2.4 2013-06-29 23:26:26 -04:00
Marc Würth
2609016dfe Changed http links to lighthouse, groups.google and github to https 
Because they get redirected anyway and we should follow good practices.
Also in many cases similar URLs were already using https
 2013-06-25 22:58:30 +02:00
mark_story
cd3c54bb9d Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/VERSION.txt
 2013-06-10 22:12:10 -04:00
euromark
a6f065e7a2 coding standards whitespace and single quote 2013-06-09 17:20:08 +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
ADmad
36c592e72e Merge branch 'master' into 2.4 2013-05-26 11:23:53 +05:30
mark_story
82d57fb8b2 Add mocked components to the enable list of components. 
Mocked components should be enabled so they receive callbacks. This
allows more realistic integration tests using testAction(). Stop
disabling the constructor as it causes a number of errors with
components that use components.

Fixes #3842
 2013-05-20 22:22:22 -04:00
mark_story
9cdc3927f2 Tidy up variable names. 
Variables with _ in them are confusing, try to use clearer names.
 2013-05-20 21:52:08 -04:00
mark_story
041c2d289f Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Console/Shell.php
 2013-03-26 20:31:54 -04:00
mark_story
386be52c71 Be compatible with PHPUnit installed with composer. 
Doing a class_exists() check is a simple way to check for PHPUnit being
installed via an autoloader. It also keeps things compatible with
a Vendor dir installation.

Fixes #3721
 2013-03-22 21:01:20 -04:00
Ceeram
99fba8c601 more coding standards fixes, minor rectaoring of testcase 2013-03-18 11:38:50 +01:00
Ceeram
89100f9476 fix coding standards 2013-03-18 11:12:28 +01:00
mark_story
e97b3acebb Merge branch 'master' into 2.4 2013-03-14 20:54:42 -04:00
Mark Story
6d301394f4 Merge pull request #1183 from cincodenada/patch-1 
Fix bug where differing key-ordering in fixtures causes errors.

When a fixtures first and last records differed data should be
inserted correctly.
 2013-03-14 17:52:06 -07:00
Joel Bradshaw
12a142d0ca Remove key-ordering sensitivity in fixtures 
Previously, the field order was effectively taken from the last record in the fixture, but the values were ordered according to the array_unique call above - primarily determined by the first record in the fixture.  If these two orders differed, values were added under the wrong keys.
 2013-03-14 14:17:59 -07:00
pjskeptic
5038e7eb38 Fixed PHPUnit include bug. 
Fixed vendor include path bug.
 2013-03-12 22:02:55 -04:00
mark_story
026df62a1f Merge branch 'master' into 2.4 2013-03-12 09:41:37 -04:00
mark_story
73310f9bfd Fix dropTables being ignore in some cases. 
When autoFixtures = false & dropTables = false, individually loaded
fixtures should not be dropped.

Fixes #3691
 2013-03-12 09:34:20 -04:00
mark_story
8209097bc3 Merge branch 'master' into 2.4 2013-03-09 12:40:59 -05:00
mark_story
0ba1aa6d38 Close the session out before erasing all the fixtures. 
Not closing the session before closing fixtures results in fatal errors
when using database sessions.

Fixes #3683
 2013-03-08 20:55:44 -05:00
mark_story
4b13e0a5f2 Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/VERSION.txt
 2013-03-04 21:55:29 -05:00
mark_story
e3b870dbf7 Fix notice error for fixtures with imported tables. 
Don't emit an error when a fixture has an imported table with no primary.

Fixes #3659
 2013-03-03 20:59:09 -05:00
mark_story
d1c88ebf8a Merge branch 'master' into 2.4 
Conflicts:
	lib/Cake/Log/Engine/FileLog.php
	lib/Cake/Utility/Validation.php
	lib/Cake/View/Helper/HtmlHelper.php
 2013-02-24 20:24:26 -05:00
euromark
111366d5c8 == to === and != to !== where applicable 2013-02-12 03:38:08 +01:00
ADmad
13029cc2bc Merge branch 'master' into 2.4 2013-02-09 02:20:16 +05:30
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
Ceeram
46aabbd6ae Testsuite header using Configure for current version 2013-01-29 09:45:42 +01:00
Ceeram
16be9d4990 remove unused local vars 2013-01-23 17:22:06 +01:00
mark_story
9c29fab4a4 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Network/Http/HttpResponse.php
 2013-01-14 20:24:56 -05:00
Cauan Cabral
099ca310e2 Ensure $sources is Array before use 2013-01-11 10:14:05 -03:00
mark_story
d0d13acaf4 Merge branch 'master' into 2.3 2013-01-08 20:15:46 -05:00
mark_story
ac1f64abc9 Start and end transactions on the fixtures datasource. 
Fixes #3490
 2013-01-05 14:50:09 -05:00
mark_story
659715664d Check for the methods that will be called. 
Check the same methods that are called. Without this diffs are not
printed for failures.

Fixes #3503
 2013-01-01 14:25:34 -05:00
Gregory Gaskill
b6b40b1196 Updating version number in test suite header. 2012-12-30 13:50:05 -08:00
Jose Lorenzo Rodriguez
f25f35353d Making getMockForModel actually useful 2012-12-23 00:30:27 +01:00
euromark
b811afbc44 double spaces to single ones 2012-12-22 23:48:15 +01:00
José Lorenzo Rodríguez
a8bd7c6678 Merge pull request #961 from dereuromark/2.3-unify-object-collection 
2.3 unify object collection
 2012-12-22 14:24:26 -08:00
euromark
881127ef4d unify new lines at the end of the file 2012-12-05 15:00:24 +01:00