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

160 commits

Author SHA1 Message Date
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
Marc Würth
1cac1846a3 Added missing calls to setUp & tearDown in tests 2013-07-29 01:52:39 +02: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
euromark
a90cb29c0f simplify else cases 2013-07-03 01:14:41 +02:00
Rik van der Heijden
e7d2892e81 Fixed unit-test locales 2013-06-11 20:18:40 +02:00
euromark
394bf1054d remove name attribute where not necessary, clean up doc blocks 2013-06-08 04:29:08 +02:00
mark_story
cbf3228c34 Fix inconsistent name/alias usage. 
TranslateBehavior should always use name instead of alias when
creating/updating/saving new translate records. It already uses name
when finding translations and the mismatch was causing translations to
not be found when saved from an aliased model.

Thanks to Joost de Keijzer for providing the initial patch.

Fixes #3865
 2013-06-02 13:50:23 -04:00
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
euromark
97c2cb367d CS fixes 2013-05-17 10:36:17 +02:00
Graham Weldon
26a08c6780 Updated copyright 2013-02-08 21:28:17 +09: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
Ceeram
16be9d4990 remove unused local vars 2013-01-23 17:22:06 +01:00
mark_story
d0d13acaf4 Merge branch 'master' into 2.3 2013-01-08 20:15:46 -05:00
mark_story
83abced287 Add tests for save() and multiple locales. 
Refs #3498
 2012-12-29 11:57:52 -05:00
Graham Weldon
a9293aa385 Merge remote-tracking branch 'origin/master' into 2.3 
Conflicts:
	lib/Cake/Console/Templates/skel/Config/core.php
 2012-12-27 22:42:18 +09:00
mark_story
965f0e87c5 Fix SQL errors in TreeBehavior. 
SQL errors were caused by escapeField() usage in TreeBehavior. Quoted
fields were not correctly unquoted.

Fixes #3491
 2012-12-26 20:55:07 -05:00
euromark
881127ef4d unify new lines at the end of the file 2012-12-05 15:00:24 +01:00
mark_story
a7f192c606 Merge branch 'master' into 2.3 2012-11-14 21:50:29 -05:00
euromark
b7e75a6399 more whitespace coding standards 2012-11-14 12:36:55 +01:00
euromark
b48f105b3f fix tabs to spaces 2012-11-14 09:55:33 +01:00
euromark
354069d229 cascade false for recover 2012-11-13 21:12:46 +01:00
euromark
22f65f7cb5 asserting that tree behavior generates valid sql in recover 2012-11-13 11:18:17 +01:00
mark_story
e0aab77dab Merge branch 'master' into 2.3 
Conflicts:
	app/Config/Schema/i18n.php
	lib/Cake/I18n/Multibyte.php
	lib/Cake/Test/Case/Log/CakeLogTest.php
	lib/Cake/Test/Case/Routing/DispatcherTest.php
 2012-11-10 21:33:26 -05:00
mark_story
644d47c843 Fix ordering on another query that was failing on travis-ci. 2012-11-10 14:24:30 -05:00
mark_story
60f9626838 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Test/Case/View/MediaViewTest.php
 2012-11-02 16:52:51 -04:00
mark_story
ddd3baf703 Fix null column errors in SQLite and Postgres. 2012-11-01 21:07:29 -04:00
mark_story
1f31340a2a Fix issue with Model::saveAssociated() and TranslateBehavior 
When combining saveAssociated() with validate=first and
TranslateBehavior. Saving data for multiple locales was not done
correctly.

Fixes #3272
 2012-10-31 23:13:56 -04:00
mark_story
414e0a3484 Fix totally incorrect test. 
TranslateBehavior should never be overlapped with real fields.
It should only be used to add fields that don't exist on the parent
table.
 2012-10-31 22:51:37 -04: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
Ber Clausen
c741f60367 Make Model::find('first') always return an array. 2012-10-25 17:57:37 -03:00
mark_story
0b0b361e48 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
 2012-10-20 20:48:11 -04:00
mark_story
888b1f4795 Fix issue with using contain() and query[contain] 
When contain() and query['contain'] = array(...) were used together
the query['contain'] values where not respected.

Fixes #3287
 2012-10-20 14:51:52 -04:00
mark_story
1aea9ac0c9 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Event/CakeEventManager.php
	lib/Cake/VERSION.txt
	lib/Cake/View/ViewBlock.php
 2012-10-15 21:46:49 -04:00
euromark
2dfb40bac0 remove duplicate line 2012-10-11 14:54:11 +02:00
ADmad
5de492fb25 Allow saving new records with pre specified primary key value with treebehavior. 2012-10-11 01:03:49 +05:30
euromark
b7f1740d2b correcting coding-standards 2012-09-28 13:49:51 +02:00
mark_story
571c8bc08c Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/Console/Command/Task/TestTask.php
 2012-09-01 13:51:40 +01:00
mark_story
e8b5d81fd7 Fix quoting of field names containing -. 
Fixes #3165
 2012-08-31 14:25:02 +01:00
mark_story
b0f2cfd1d1 Fix coding standards. 2012-08-15 20:19:08 -04:00
euromark
e1fbfcef00 fix contain for find method 2012-08-13 08:10:51 +02:00
mark_story
788cf52572 Fix saving empty values for translated fields with multiple locales 2012-08-03 22:40:38 -04:00
Christopher Vrooman
de1450763b Added a failing test to testSavePartialFields 
Added a failing test to the testSavePartialFields method where the title data for two locales creates only one empty content entry instead of two.
 2012-08-03 21:19:44 -04:00
mark_story
e6ef218600 Fix associated translations being inserted. 
Due to changes introduced in [1c0b6c076a]
associated translations would incorrectly be saved with a value of ''.

Fixes #3057
 2012-07-22 20:59:24 -04:00
mark_story
a63dd9ee9d Fix incorrect formatting in TreeBehavior. 
Fixes #3045
 2012-07-17 21:06:41 -04:00
mark_story
a7c79e5da2 Fix warnings when deleting records that do not exist. 
Fixes #3037
 2012-07-14 15:54:07 -04:00
mark_story
5e680cb292 Add tests for translate + partial fields. 
Refs #3009
 2012-07-07 12:03:29 -04:00
mark_story
9a8ceaeba6 Merge branch '2.1' into 2.2 
Conflicts:
	lib/Cake/Test/Case/View/XmlViewTest.php
 2012-05-30 21:20:56 -04:00
mark_story
0bfcd49249 Fix unbindTranslation not unbinding. 
There were documented use cases that have never worked.  Fix that.
Also rename a method so it better describes what it does.

Fixes #2913
 2012-05-27 21:25:55 -04:00
mark_story
7592eb94ac Fix test cases with postgres. 
Setting id values confuses postgres' sequences.
 2012-05-10 20:55:46 -04:30
mark_story
d9bf3cf987 Fix additional issues with saveAll(). 
Fixes #2857
 2012-05-10 20:55:46 -04:30
mark_story
d73bc6b867 Fix error in Sqlite tests. 2012-05-10 20:55:45 -04:30
mark_story
8334ebebed Fix saving translate records with saveAll() 
Also fixes issues saving translated data with validation
disabled.  By enabling data backup in beforeSave() and beforeValidate()
the existing behavior is preserved, and the current issue is fixed.

Fixes #2857
 2012-05-10 20:55:45 -04:30
mark_story
597913aa5b Fix test cases with postgres. 
Setting id values confuses postgres' sequences.
 2012-05-07 22:10:17 -04:00
mark_story
fbba3621b5 Fix additional issues with saveAll(). 
Fixes #2857
 2012-05-07 21:36:28 -04:00
mark_story
a1e06b9c8b Fix error in Sqlite tests. 2012-05-06 23:39:02 -04:00
mark_story
6c5255ac73 Fix saving translate records with saveAll() 
Also fixes issues saving translated data with validation
disabled.  By enabling data backup in beforeSave() and beforeValidate()
the existing behavior is preserved, and the current issue is fixed.

Fixes #2857
 2012-05-06 22:48:15 -04: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
euromark
bc2cd00123 cake 2.2 test case fixes (assert corrections, correct class names) 2012-04-21 15:02:35 +02:00
mark_story
72c3059d94 Add missing parent calls. 
Fixes piles of failing tests.
 2012-04-15 22:20:34 -04:00
Ceeram
2b7fe21ee0 remove all Set::extract() from core and tests 2012-04-05 01:33:57 +02:00
mark_story
19e0d8d946 Switch usage to Hash where possible. 2012-03-26 22:32:53 -04:00
Kyle Robinson Young
90e7afbdc7 Correct parameter order of assertEquals and assertNotEquals 2012-03-22 23:37:12 -07:00
mark_story
fc234d82f1 Fix coding standards in Case/Model/Behavior. 2012-03-18 14:31:13 -04:00
Juan Basso
3b1bd90ad6 Updated copyright to 2012. 2012-03-12 22:46:07 -04:00
mark_story
7665f369fa Merge branch '2.1-type-hinting-corrections' into 2.1 2012-02-25 20:07:18 -05:00
euromark
973dce916a php5 corrections 2012-02-25 19:46:07 -05:00
euromark
45112088a1 type hinting models 2012-02-25 19:46:06 -05:00
Kyle Robinson Young
4176e59e52 Typo fixes in tests 2012-02-23 15:29:53 -08:00
Kyle Robinson Young
32e7943b00 Fix merge conflict with 62f8dea 2012-02-18 04:39:32 -08:00
Mark Story
c2d753ffb4 Merge pull request #500 from shama/patch-visibility 
Add missing visibility keywords
 2012-02-21 17:36:36 -08:00
Kyle Robinson Young
45ec5d73c5 Add missing visibility keywords 2012-02-16 23:13:12 -08:00
Kyle Robinson Young
75882507bc Remove unnecessary loadFixtures() calls 2012-02-16 22:37:18 -08:00
Ceeram
2a9e6771c3 allow other parent field, set in find options or TreeHebavior, for threaded find. Fixes #1769 2012-01-19 23:26:43 +01:00
mark_story
c548b6b88a Fix issue with find(count) and translated conditions. 
Because count queries did not have joins created for the translated
fields pagination would generate invalid queries. Checking the conditions
for translated fields and adding in the correct joins solves that.
Extract what would have been duplicated code into methods.

Add a few protected properties to keep method signatures sane. The code
could be even simpler if the existing find(count) join was removed.

Fixes #2349
 2012-01-08 20:40:25 -05:00
mark_story
b5f918765e Adding docs + exceptions for name translation. 
Closes #2367
 2011-12-30 20:39:04 -05:00
euromark
a41539dfa4 Indentation fix (tab instead of spaces) 
Fixes #2398

Conflicts:

	lib/Cake/Test/Case/Console/Command/ShellTest.php

Signed-off-by: mark_story <mark@mark-story.com>
 2011-12-20 22:26:43 -05:00
ADmad
1358af783b Added test case for TreeBehavior::recover(). Refs #2392 2011-12-18 15:23:49 +05:30
Kyle Robinson Young
51f9837db4 Code standards formatting 2011-12-15 22:52:07 -08:00
Kyle Robinson Young
1e1c7a036d Code consistency formatting tweaks 2011-12-06 12:52:48 -08:00
Kyle Robinson Young
94e119fe67 Adhere to code formatting standard 2011-11-30 23:21:31 -08:00
Kyle Robinson Young
5876744709 Adhering to coding standards 2011-11-30 07:44:11 -08:00
Kyle Robinson Young
98f03dc6df Replacing test case compatibility functions 2011-11-16 21:07:08 -05:00
Ceeram
025133db32 Fix tests which might fail due to unexpected order on finds 2011-11-16 13:15:14 +01:00
mark_story
0a0a09920b Updating for PHP5.4 
- Fixing strict errors.
- Fixing call time pass by reference as its been removed in PHP5.4
- Fix assign new as a reference, which has been removed.
 2011-11-12 21:42:19 -05:00
Gun.io Whitespace Robot
4742168253 Remove whitespace [Gun.io WhitespaceBot] 2011-10-28 18:25:08 -04:00
Renan Gonçalves
229bf8e984 Keeping BC on short syntax for Acl and Tree behavior. 2011-10-16 12:06:41 +02:00
Renan Gonçalves
3a04bb4733 Dropping short syntax support for Behavior configuration. 
Also making sure that $settings comming from ObjectCollection::normalizeObjectArray() is always an array.
 2011-10-15 20:52:41 +02:00
Gonçalo Marrafa
4adc042882 Fix association lazy-loading when used with ContainableBehavior 2011-10-14 17:53:37 -04:30
Majna
8c3f64be52 Fixing doc blocks in Test suite and some visibility keywords. 2011-10-10 23:18:48 +02:00
mark_story
c9bd97309f Merge branch '1.3' into merger 
Conflicts:
	cake/libs/configure.php
	cake/libs/controller/components/email.php
	cake/libs/model/datasources/dbo/dbo_mysqli.php
	cake/libs/view/pages/home.ctp
	cake/tests/cases/libs/controller/components/email.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	lib/Cake/Config/config.php
	lib/Cake/Console/Command/Task/ViewTask.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/ModelReadTest.php
	lib/Cake/Test/Case/Model/ModelValidationTest.php
	lib/Cake/Test/Case/Utility/InflectorTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Utility/Inflector.php
	lib/Cake/Utility/Validation.php
	lib/Cake/VERSION.txt
	lib/Cake/View/Helper.php
	lib/Cake/View/Helper/FormHelper.php
 2011-10-01 22:38:20 -04:00
mark_story
6a4e7558fc Merge branch '1.3' into merger 
Conflicts:
	cake/basics.php
	cake/console/libs/tasks/extract.php
	cake/libs/view/helpers/js.php
	cake/tests/cases/console/libs/tasks/extract.test.php
	cake/tests/cases/libs/model/datasources/dbo/dbo_mysql.test.php
	cake/tests/cases/libs/model/datasources/dbo_source.test.php
	cake/tests/test_app/views/pages/extract.ctp
	lib/Cake/Cache/Engine/MemcacheEngine.php
	lib/Cake/Model/Behavior/ContainableBehavior.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Model/Datasource/DboSource.php
	lib/Cake/Model/Model.php
	lib/Cake/Test/Case/Model/Behavior/ContainableBehaviorTest.php
	lib/Cake/Test/Case/Model/CakeSchemaTest.php
	lib/Cake/Test/Case/Model/Datasource/Database/PostgresTest.php
	lib/Cake/Test/Case/View/Helper/FormHelperTest.php
	lib/Cake/Test/Case/View/Helper/TimeHelperTest.php
 2011-09-18 12:09:04 -04:00
Jelle Henkens
7ba2f90b2a Refactoring expectError() calls to PHPUnit annotations 2011-09-13 19:56:37 +01:00
Juan Basso
620a65b2fc Merge branch '2.0' into 2.0-api-doc 
Conflicts:
	lib/Cake/Test/Case/View/Helper/CacheHelperTest.php
	lib/Cake/Utility/Debugger.php
 2011-08-14 21:12:05 -04:00
ADmad
7983b4109b Data returned by Model::save() not contains primary key too when new record is created. Closes #1869 2011-08-14 02:56:08 +05:30
ADmad
9577fb0ca2 Fixed TreeBehavior::childCount(). Closes #1833 2011-07-31 12:39:52 +05:30
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