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

4091 commits

Author SHA1 Message Date
mark_story
ce3aa692b5 Use set order for test that failed on travis. 2012-11-02 18:06:59 -04: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
9ce70044b0 Fix missing query arguments in array urls. 
Adding documented features that previously wasn't implemented.

Fixes #3328
 2012-11-02 16:46:36 -04:00
Linus Probert
03176c6c8c Added test for View::startIfEmpty($name) 2012-11-02 21:29:31 +01:00
Linus Probert
43d766f45c Added View::startIfEmpty($name) 2012-11-02 21:29:28 +01:00
Ceeram
093275aef6 Use correct value when using virtualFields in conditions and IN (), refs PR#897 
Squashed commit of the following:

commit 6a986953e16601fb34a132df24ae16f882f218cf
Merge: babd714 118dd8c
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Nov 2 13:02:15 2012 +0100

    Merge branch 'master' into virtualcondition

commit babd714d80178c68b0e3fbcc21fc53b846484fd8
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Nov 2 00:22:43 2012 +0100

    fix incorrect tests

commit 9a46c13e1aa13905b8e5474947933676e03009ce
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Nov 1 11:44:19 2012 +0100

    add test for regular fields and conditionKeysToString with IN

commit 3aa62e5cb93aa0c7bbb47e874fc1446873dd0d27
Merge: a8f0c3d 1f31340
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Nov 1 11:37:01 2012 +0100

    Merge branch 'master' into virtualcondition

commit a8f0c3d918761ff2c456cc3a53f1e3ee5b1c6173
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Oct 11 16:46:10 2012 +0200

    use correct value when using virtualFields in conditions and IN ()
 2012-11-02 14:29:38 +01:00
Ceeram
b18550c667 fix incorrect tests 2012-11-02 12:16:32 +01:00
Ceeram
b8607ca2ed fix fieldlist, refs PR808 and PR851 
Squashed commit of the following:

commit 7007dba0eb836f852aaca95fada103bc4ba993a9
Merge: 3ca4d23 7d84486
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Nov 2 10:53:39 2012 +0100

    Merge branch '2.3' into calinseciu-2.3

commit 3ca4d231bf80d2bb1c0572196f633da68c1a0db7
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Sep 23 12:45:00 2012 +0200

    more tests added

commit e6b12532655671aff2b966a9be89b2625a715e8f
Author: Ceeram <c33ram@gmail.com>
Date:   Tue Sep 18 09:18:32 2012 +0200

    change methodname and visbilty

commit 70396265025190ab2fbc159911ec3e064cc44fb2
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Sep 6 17:26:52 2012 +0200

    fix fieldlist, refs PR #808

commit e9db96bfe163609eeefba430d8353c822aabacb0
Merge: 99b798f adb8142
Author: Ceeram <c33ram@gmail.com>
Date:   Thu Sep 6 16:26:40 2012 +0200

    Merge branch '2.3' of git://github.com/calinseciu/cakephp into calinseciu-2.3

commit adb8142d2694692ec71a063ac2ad1b275f3a67c9
Author: calinseciu <calinseciu@gmail.com>
Date:   Thu Aug 30 17:57:50 2012 +0300

    Add foreignKey to whitelist in saveAssociated()

    Association's foreignKey doesn't get saved when saving hasMany associations since it's not in the model's whitelist after validation.
    This happens if you don't send the foreignKey with the associated records data.
 2012-11-02 10:56:49 +01:00
Rachman Chavik
7d844866f0 RedisEngine: authenticate connection if 'password' is set 2012-11-02 09:38:18 +07:00
mark_story
118dd8c534 Make fragile test less fragile. 2012-11-01 21:36:14 -04:00
mark_story
ddd3baf703 Fix null column errors in SQLite and Postgres. 2012-11-01 21:07:29 -04:00
ADmad
cc6b699db4 Added missing App::uses() statement. Closes #3331 2012-11-02 02:16:02 +05:30
Schlaefer
dfe54e90d6 removed Inflictor::slug()replacement from Ä to A 
The slug replacement for Ä -> A is not necessary, because the better
replacement Ä -> Ae is already defined and also covered by the test case.
 2012-11-01 15:47:50 +01:00
Ceeram
0196c6f686 code optimizing and simplify _crypt(), see PR #853 2012-11-01 14:15:52 +01: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
8035b37df2 Only set $request->data with PUT/DELETE when it can be decoded. 
Setting $request->data to the raw put data isn't overly useful unless it
can be decoded.  Generally $request->data is expected to be an array,
when its a string things can go funny.

Fixes #3320
 2012-10-31 21:02:47 -04:00
ADmad
26d8351af4 Fixing "required" field detection again. Closes #3305 2012-11-01 05:04:37 +05:30
mark_story
b9ee4fc9f1 URL decode redirect urls. 
Some servers send url encoded Location headers. Decode location headers
before processing a redirect.

Fixes #3310
 2012-10-29 22:29:13 -04:00
Kyle Robinson Young
f10c669813 Code standards fixes 2012-10-29 08:14:17 -07:00
mark_story
478461d301 Merge branch 'master' into 2.3 2012-10-28 21:42:48 -04:00
mark_story
d9a3ab844f Fix another test that fails on postgres sometimes. 2012-10-28 21:16:50 -04:00
Jose Lorenzo Rodriguez
b75bb8ece7 Update version number to 2.3.0-beta 2012-10-28 23:17:25 +01:00
ADmad
1e50ead75b Fix coding standard error 2012-10-29 02:19:24 +05:30
mark_story
94bd2cedcf Fix more off by a second errors 2012-10-28 16:15:20 -04:00
mark_story
ab2ce29bd6 Fix a few more tests that sometimes fail on postgres. 2012-10-28 16:11:07 -04:00
mark_story
f8d602cd7b Fix coding standard. 2012-10-28 15:59:34 -04:00
Jose Lorenzo Rodriguez
8bca041066 Revert "Fixing failing test case in RssHelper" 
This reverts commit 7715689523.
 2012-10-28 20:48:31 +01:00
Jose Lorenzo Rodriguez
8538c0e8ea Avoiding problems with relative paths in shell dispatcher 2012-10-28 12:57:44 +01:00
Jose Lorenzo Rodriguez
7715689523 Fixing failing test case in RssHelper 2012-10-28 11:52:30 +01:00
mark_story
c794e295a0 Merge branch 'master' into 2.3 2012-10-27 22:50:02 -04:00
mark_story
667dfd308f DateTime::getTimestamp() only exists in PHP > 5.3.0 2012-10-27 22:49:43 -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
mark_story
e8f727fe68 Using fixed points in time. 
This avoids lulz when the United Kingdom changes change to/from DST at
a different time than your local timezone.
 2012-10-27 21:12:34 -04:00
euromark
0f978195d6 coding standards regarding whitespaces 2012-10-27 00:46:12 +02:00
euromark
5324a8ca9c cleanup 2012-10-27 00:26:54 +02: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
Ceeram
870d77c89e Make the test more accurate on type of result 2012-10-26 20:49:04 +02:00
Ceeram
f4f4aa4a2a Squashed commit of the following: 
commit 22311a1e62934da757d53d7aecfce884f5a1ca10
Merge: fda331e d051b69
Author: Ceeram <c33ram@gmail.com>
Date:   Fri Oct 26 14:40:24 2012 +0200

    Merge branch '2.3' into currency

commit fda331eab169068763717f88838032b7c0c02c29
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Oct 7 23:53:03 2012 +0200

    NumberHelper now also uses the default currency from CakeNumber, instead of default argument value

commit 967bf8e27ea2438f1972390b7ef78ae62e17a762
Author: Ceeram <c33ram@gmail.com>
Date:   Sun Oct 7 18:01:35 2012 +0200

    Adding feature to set default currency on CakeNumber, to make repetetive calls to CakeNumber::currency() more DRY
 2012-10-26 19:32:39 +02:00
Ceeram
39dcb80b45 Fix failing test, find('first') now returns empty array when no record was found 2012-10-26 16:32:15 +02:00
Mark Story
a0665feac4 Merge pull request #917 from bar/master-find 
Make Model::find('first') always return an array.
 2012-10-26 07:00:48 -07:00
ADmad
0ddd130833 Improved "required" field detection. Closes #3305. 2012-10-26 12:58:24 +05:30
Rachman Chavik
e61483126c CakeSchema: adds empty line between tables 2012-10-26 13:27:47 +07:00
mark_story
559130b87b Try and make test less likely to fail. 2012-10-25 21:56:00 -04:00
mark_story
50a4b792be Clean up code in FormHelper::dateTime() 
Remove $$ variables and split a huge method into smaller pieces.
 2012-10-25 21:28:01 -04:00
mark_story
c359e4b689 Fix issue with array based values and interval. 
Fixes #3299
 2012-10-25 20:46:54 -04:00
Mark Story
d051b69312 Merge pull request #914 from dereuromark/2.3-i18n-extract 
Normalize paths in generate pot files to always use /

Fixes #3306
 2012-10-25 17:12:55 -07:00
Renan Gonçalves
02cfacec41 Make app/Console/cake pwd insensitive on Mac OS X. 
Follow up of [36e15a065b].
 2012-10-26 01:14:09 +02:00
Ber Clausen
c741f60367 Make Model::find('first') always return an array. 2012-10-25 17:57:37 -03:00
Ber Clausen
d269588e78 Avoid duplicating RequestHandler component. 2012-10-25 14:57:16 -03:00
euromark
cc436146be making tests pass on windows again 2012-10-25 17:37:35 +02:00
euromark
f3bbe89ede solves ticket 3306 2012-10-25 17:08:52 +02:00
mark_story
528671f468 Replace Set with Hash. 2012-10-25 10:07:39 -04:00
Mark Story
555bfc32ea Merge pull request #909 from dereuromark/master-magic-input-bc 
Master magic input bc

Fixes #3295
 2012-10-25 07:05:31 -07:00
mark_story
83d307e545 Try to set order on more things. 2012-10-24 22:38:15 -04:00
mark_story
9e0778951a Add some fixed orders. 
Hopefully this makes tests in postgres more reliable.
 2012-10-24 21:27:01 -04:00
mark_story
5786245832 Fix lint error. 2012-10-24 21:21:11 -04:00
mark_story
c4b9fa6c7a Fix failing tests. 2012-10-24 21:00:56 -04:00
Mark Story
2841611c0f Merge pull request #911 from dogmatic69/type-checks 
Type checks
 2012-10-24 17:26:30 -07:00
Ceeram
6fc019e74d afterRender should not be triggered when callbacks is false 2012-10-25 01:16:16 +02:00
dogmatic69
641ba9f3e6 Merge branch '2.3' into type-checks 
Conflicts:
	lib/Cake/Error/ExceptionRenderer.php
	lib/Cake/Routing/Dispatcher.php
 2012-10-24 19:03:44 +01:00
mark_story
d2010308d4 Merge branch 'master' into 2.3 2012-10-23 20:20:52 -04:00
euromark
2ac08bf024 fix whitespace 2012-10-23 19:04:52 +02:00
mark_story
3729ac1f2f Fix issue where the incorrect meridian would be selected. 
When combining 12 hour format, interval and afternoon times, the
incorrect meridian would be selected.  Moving the hour math into
FormHelper::hour() makes that method generally more correct and lenient
on its input.

Fixes #3299
 2012-10-23 12:47:12 -04:00
euromark
044cf60b69 move the test case to its own method 2012-10-23 16:07:43 +02:00
euromark
5064601c6f adding test case 2012-10-23 15:11:23 +02:00
euromark
9a9ac6f3a7 allow input type=number to also be magic 2012-10-23 15:11:22 +02:00
ADmad
3ee267d7ef Moving the mb_* functions to bootstrap.php 2012-10-23 16:58:07 +05:30
ADmad
1763f46340 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/bootstrap.php
 2012-10-23 16:53:01 +05:30
ADmad
922d9865fa Moving multibyte encoding setting to bootstrap.php. Closes #3290 2012-10-23 13:20:01 +05:30
Mark Story
746eaf9389 Merge pull request #894 from dereuromark/comp-fix-save-all 
BC mod for saveAll()
 2012-10-22 18:40:38 -07:00
Mark Story
d75bd48c25 Merge pull request #905 from dereuromark/2.3-ini 
allow ini files to have separators between sections for better readability
 2012-10-22 18:38:49 -07:00
mark_story
ed6ff92296 Remove bad test. 2012-10-22 20:55:56 -04:00
mark_story
a0a61b5980 Fix issue where createSchema() would omit primary keys sometimes. 
Fix missing primary key SQL when using the primary flag + other indexes.

Fixes #3292
 2012-10-22 20:46:10 -04:00
Jose Lorenzo Rodriguez
1c0c8604c8 Pushed before fxing error in test case, I suck. Refs #3291 2012-10-22 23:09:31 +02:00
Jose Lorenzo Rodriguez
9dc3b243ac Correct inflection rules for cookies, fixes fixes #3291 2012-10-22 23:07:42 +02:00
AD7six
35686c9293 use the right language domain 
these messages are for developers, not end users
 2012-10-22 10:55:40 +02:00
Jose Lorenzo Rodriguez
c00d58b4ef Fixed problems with resetSequence() not using the correct sequence name 
in postgres
 2012-10-21 16:32:52 +02:00
mark_story
d4631a6ead Remove bad test. 2012-10-20 21:03:38 -04: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
08556ab879 Fix saveAssociated() with validate=first, atomic=false 
When using the above options & validation errors on the associated
models, saving would not be aborted.

Fixes #3285
 2012-10-20 15:12:05 -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
f457f07b5c Force field validation to use sha1 
When using blowfish as your application's hashing strategy, form field
validation would fail horribly.  Forcing sha1 fixes this and restores
behavior consistent with 2.2.x

Fixes #3280
 2012-10-18 21:26:26 -04:00
euromark
5a8092fc1b allow ini files to have separators between sections for better readability 
dump now makes spaces between sections in init files
 2012-10-18 17:20:15 +02:00
mark_story
ea467e72d7 Swap isset() for array_key_exists() 
Fixes #3283
 2012-10-17 17:23:08 -04:00
mark_story
307759516b Try to make tests less fragile. 2012-10-15 22:54:03 -04:00
mark_story
1cc82ff39f Merge branch 'master' into 2.3 2012-10-15 21:48:55 -04:00
mark_story
6d3ae3b83c Fix missed use of VERSION. 2012-10-15 21:48:36 -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
mark_story
f6c5ceb77a Use id() as VERSION doesn't exist in phpunit 3.6 2012-10-15 21:38:10 -04:00
mark_story
f89fe0e1ef Fix tests that fail in PHPUnit 3.7 
Add skips for PHPUnit 3.6. Mock object expects required clones in 3.6,
but fail in 3.7 with clones.
 2012-10-15 21:36:12 -04:00
Adam Taylor
4090c2e932 Remove trailing whitespace from comments 
See http://groups.google.com/d/topic/cakephp-core/fuHTYMKVJno/discussion
 2012-10-15 18:19:37 -06:00
mark_story
2a803ea412 Add missing import 
Refs GH-877
 2012-10-14 22:22:46 -04:00
mark_story
3e0fa0009b Show the last 200 queries instead of the first 200. 
Fixes #3273
 2012-10-14 21:30:28 -04:00
Graham Weldon
41ae19b5bc Removed spaces at the end of lines. 2012-10-15 11:44:31 +11:00
mark_story
59f84024e5 Handle REQUEST_URI with domain names properly. 
Don't depend on parse_url() as it fails with corrupted urls.  Instead
use FULL_BASE_URL to prepare an absolute path.

Fixes #3270
 2012-10-14 11:58:07 -04:00
ADmad
56a0eb04b7 Fix incomplete patch 61dd1098d3 2012-10-14 18:44:10 +05:30
Mark Story
7ea3ee466d Merge pull request #899 from dereuromark/2.3-more-tests 
default value null makes more sense. add test cases for false.
 2012-10-13 18:28:34 -07:00
ADmad
61dd1098d3 Allow specifying tag for current page number. Closes #2892 2012-10-13 12:34:00 +05:30
mark_story
513851d1c1 Update skel directory logging configuration. 2012-10-13 02:29:25 -04:00
euromark
17be6d0472 remove default value for debug's first argument 2012-10-12 16:14:17 +02:00
euromark
7bf08fdcc7 default value null makes more sense. add test cases for false. 2012-10-12 16:03:05 +02:00
ADmad
8bc17996dc Update docblock 2012-10-11 20:00:30 +05:30
euromark
2dfb40bac0 remove duplicate line 2012-10-11 14:54:11 +02:00
mark_story
1110e26483 Fix 0'th index file not being copied to $_FILES. 
Fixes #3256
 2012-10-11 08:39:46 -04:00
mark_story
8800d7bdec Reduce duplication in test case. 2012-10-11 08:28:59 -04:00
mark_story
b1dfab87e4 Fix autoLinkUrls so it re-capture query strings. 
Fixes #3296
 2012-10-11 08:28:59 -04:00
euromark
1e2ac0b9c8 comp mod for saveAll() 
better approach

test case to assert saveAll still behaves like previous versions
 2012-10-11 14:03:59 +02:00
ADmad
f06bdde8c6 Fix docblock 2012-10-11 12:33:46 +05:30
ADmad
5de492fb25 Allow saving new records with pre specified primary key value with treebehavior. 2012-10-11 01:03:49 +05:30
Mark Story
4acc687dcd Merge pull request #890 from dereuromark/master-not-empty-validation 
Fix validation error domain for notEmpty
 2012-10-09 14:52:11 -07:00
mark_story
57681ff115 Fix code style errors. 2012-10-09 13:20:53 -04:00
Mark Story
2e15689d19 Merge pull request #892 from dereuromark/router-fix 
avoid offset -1 error on tests etc
 2012-10-09 05:01:06 -07:00
euromark
0197700e4f simplify check 2012-10-09 12:24:10 +02:00
euromark
2cff67184f avoid offset -1 error on tests etc 2012-10-09 11:49:44 +02:00
ADmad
33a879ff41 Fix find('count') with 'group' when result has only one group. Closes #1677 2012-10-09 10:43:27 +05:30
mark_story
1234f96a6c Update version number to 2.2.3 2012-10-08 20:15:03 -04:00
mark_story
9a66768aa4 Merge branch 'master' into 2.3 2012-10-08 13:08:58 -04:00
mark_story
72f4d4fac0 Fix issue with logging scopes 
Logging scopes should be exclusive and not allow messages matching on
level alone to be logged.  By using scopes + levels you opt-in to new
behavior so grabbing all messages by level should not occur.

Fixes #3264
 2012-10-08 12:57:02 -04:00
mark_story
a59db11e4e Update doc blocks for logging + scopes. 2012-10-08 11:41:32 -04:00
mark_story
2232c7e15d Update doc blocks to reflect reality. 
Closes #3263
 2012-10-08 10:58:53 -04:00
ADmad
a1aa73c1a2 Cache character set names 2012-10-07 21:58:49 +05:30
euromark
e85b2a072a fix validation error domain for notEmpty 
$this->_validationDomain for default notEmpty message

notEmpty default error message
 2012-10-07 14:17:31 +02:00
AD7six
fa6defea37 url encode nested named parameters in unmatched routes 
reference: #2988
and 31033239bd
 2012-10-05 11:40:58 +02:00
mark_story
972d5752bf Improve error message. 
Fixture datasources must begin with test so you don't accidentally use
a real datasource.

Fixes #3254
 2012-10-04 20:41:02 -04:00
AD7six
5140baf83d Load routes as late as possible. 
As a concequence - routes will also work by default in the cli
 2012-10-04 21:41:12 +02:00
mark_story
57f81da983 Fix variable naming. 2012-10-04 11:27:24 -04:00
ADmad
1c0492eb8b Allow throwing exception instead of redirecting upon unauthorized access attempt. Closes #591 2012-10-04 18:40:57 +05:30
mark_story
feda6e06a0 Reduce some code complexity. 2012-10-03 22:59:35 -04:00
ADmad
0fb4d1d3d8 Removing unneeded App::uses() call 2012-10-04 00:24:27 +05:30
mark_story
e58c93c39d Fix trailing whitespace. 2012-10-01 21:21:53 -04:00
mark_story
a3ae58da09 Merge branch 'master' into 2.3 
Conflicts:
	lib/Cake/View/View.php
 2012-10-01 21:20:25 -04:00
ADmad
47708c52cd Allow content to be added before existing content in view block. 2012-10-02 00:11:54 +05:30
Mark Story
127b906fdb Merge pull request #883 from andraskende/2.3 
formatting changes..
 2012-10-01 09:30:08 -07:00
ADmad
ce9ad1f2ed Fix failing tests 2012-10-01 20:22:41 +05:30
euromark
7383298410 making messages() and errors() reset themselves by default 2012-10-01 14:20:53 +02:00
Andras Kende
fa5d2c1941 removed 2 empty lines 2012-10-01 04:19:36 -07:00
Andras Kende
f5be83d452 formatting changes.. 2012-10-01 02:58:30 -07:00
mark_story
c94886a988 Add missing import that causes tests to fail in isolation. 2012-09-30 22:51:19 -04:00
mark_story
affb3192ad Fix issue where including elements + extending views fails. 
If you include an element before calling extend(), the parent view
will be assumed to be an element instead of a view/layout.

Fixes #3248
 2012-09-30 22:44:27 -04:00
dogmatic69
408e619c9f Merge branch '2.3' into type-checks 
Conflicts:
	lib/Cake/Console/Command/Task/ModelTask.php
	lib/Cake/Controller/Component/RequestHandlerComponent.php
	lib/Cake/Model/Datasource/Database/Mysql.php
	lib/Cake/Utility/CakeNumber.php
 2012-10-01 02:08:00 +01:00
mark_story
739b3b70f7 Update text in routes.php to clarify when to remove core routes. 2012-09-30 20:17:50 -04:00
dogmatic69
095e8df995 fixing a error in the tests 2012-10-01 00:49:39 +01:00
ADmad
89ab0a2d06 Fix docblock 2012-09-30 23:44:32 +05:30
ADmad
035f727686 Replace Model::read() with Model::find('first') in baked controller 
Removed references to Ajax and Javascript helpers
 2012-09-30 14:41:37 +05:30
mark_story
80c355baa5 Make minutes/hours wrap around correctly. 
Also account for times around midnight that roll over days/months/years.

Fixes #3242
 2012-09-28 22:50:46 -04:00
mark_story
59e948fb1b Merge branch 'master' into 2.3 2012-09-28 21:20:24 -04:00
mark_story
853d866c35 Remove port numbers from Message-id domains. 
Fixes #3244
 2012-09-28 21:20:14 -04:00
Mark Story
51245ce41d Merge pull request #874 from dereuromark/2.3-languages 
after correcting nld the iso standard should be enforced for all langs
 2012-09-28 17:55:02 -07:00
Mark Story
87fc86133c Merge pull request #873 from dereuromark/coding-standards 
correcting coding-standards
 2012-09-28 17:49:32 -07:00
James Michael DuPont
2d46fc60be Fixing undefined variable usage 
Squash of pull request #872
 2012-09-28 20:46:25 -04:00
euromark
a33b187a09 doc block correction 2012-09-28 14:51:51 +02:00
euromark
032704346a after correcting nld the iso standard should be enforced for all languages 2012-09-28 14:46:29 +02:00
euromark
b7f1740d2b correcting coding-standards 2012-09-28 13:49:51 +02:00
mark_story
e5503326ac Fix coding standard error. 2012-09-27 21:44:19 -04:00
mark_story
eed59a95ad Fix whitespace. 2012-09-27 21:42:15 -04:00
mark_story
393849a9ba Make exception rendererer more resiliant 
Exceptions in beforeRender() should render correct error pages.

Fixes #3235
 2012-09-27 21:39:22 -04:00
mark_story
99edef0abc Re-order assertions. 
Group the true/false assertions.
 2012-09-27 21:39:14 -04:00
Mark Story
9c78aae87e Merge pull request #871 from dereuromark/2.3-dispatch 
move charset/App.encoding into CakeResponse
 2012-09-27 17:38:58 -07:00
euromark
b47e3a7d92 move charset/App.encoding into CakeResponse 2012-09-27 20:28:19 +02:00
euromark
c87b53a7d8 correcting iso standard for nld (dutch) - making dut the alias 2012-09-27 10:10:40 +02:00
mark_story
76d21c6d56 Try to fix another test failure caused by blowfish. 
travis ci seems to have wonky hashing with blowfish on the 5.2 boxes.
Skip tests when we know blowfish is messed up.
 2012-09-26 22:25:05 -04:00
mark_story
ea784f68dc Try skipping blowfish tests if hashes are wrong. 
Another attempt at fixing failing tests on travisci.
 2012-09-26 22:00:52 -04:00
mark_story
8bbb1f166c Revert "Attempting to get passing builds on travisci" 
This reverts commit 61d6f716bc.
 2012-09-26 21:58:14 -04:00
mark_story
61d6f716bc Attempting to get passing builds on travisci 
Currently the 5.2 builds fail due to the length checks on blowfish
hashes.  Try a shorter wall to see if those builds will pass.
 2012-09-26 21:48:05 -04:00
mark_story
0fc9a2c29c Update query building in TranslateBehavior. 
* Reduce duplicate checks for Alias.*.
* Allow both the quoted and non quoted version of Alias.*

Fixes #3210
 2012-09-25 21:01:19 -04:00
Jose Lorenzo Rodriguez
c870044262 Fixed typo 2012-09-25 17:05:41 +02:00
Jose Lorenzo Rodriguez
047ffd1530 Removing variable from dump test as it does not exist anymore 2012-09-25 17:01:06 +02:00
Jose Lorenzo Rodriguez
d5c9d97dc1 Merge remote-tracking branch 'origin/master' into 2.3 
Conflicts:
	lib/Cake/Model/Behavior/TranslateBehavior.php
	lib/Cake/Model/CakeSchema.php
	lib/Cake/Utility/CakeTime.php
	lib/Cake/Utility/ClassRegistry.php
	lib/Cake/View/MediaView.php
 2012-09-25 16:36:03 +02:00
Jose Lorenzo Rodriguez
6818d69fc3 Fixed issue in CakeTime that it would apply userOffset twice when using 
the format() function
 2012-09-25 15:23:46 +02:00
Jose Lorenzo Rodriguez
b0822d2246 Introducing failing test case to prove issue in CakeTime 2012-09-25 15:23:19 +02:00
Ceeram
e4542827c8 avoid pass by reference error on 5.4 2012-09-24 18:26:25 +02:00
Renan Gonçalves
fe5b49e6eb Fixing variable name used to set error handlers. 2012-09-24 13:41:56 +02:00
Ceeram
3665a95996 refactoring asset dispatcher filter 2012-09-24 10:06:45 +02:00
dogmatic69
1b36853355 undo the change to avoid change in behavior 2012-09-21 23:49:24 +01:00
dogmatic69
cd99b7d6ff fixing error pointed out by dereuromark with recursive https://github.com/cakephp/cakephp/pull/846#commitcomment-1884073 2012-09-21 23:40:21 +01:00
dogmatic69
36314e6d37 converting if ($foo != "") to if ($foo) 2012-09-21 23:34:37 +01:00
dogmatic69
8dc4de5de8 converting if ($foo != false) to if ($foo) 2012-09-21 23:32:52 +01:00
dogmatic69
b1f26b59a3 converting if ($foo != null) to if ($foo) 2012-09-21 23:30:43 +01:00
José Lorenzo Rodríguez
2818ec6eb4 Merge pull request #859 from dereuromark/2.3-format-delta 
adding CakeNumber::formatDelta() and fixing issue with format()
 2012-09-21 00:18:35 -07:00
dogmatic69
6d4f4b57d7 adding a plugin propery to models wwith tests for ticket #85 
Merge pull request #696
 2012-09-20 21:31:31 -04:00
mark_story
268e58956d Attempt to make tests pass when OpenSSL is not enabled. 2012-09-20 21:28:29 -04:00
mark_story
d3ba9703a5 Try to make some time related test failures go away. 2012-09-20 21:07:14 -04:00
Ber Clausen
aaefbf1c2f Add MySQL FULLTEXT support. 
Minor optimizations and testing added.
Merge pull request #862 from bar/mysql-fulltext

Fixes #262
 2012-09-20 20:42:30 -04:00
mark_story
a9750264e4 Revert "Add MySQL FULLTEXT support." 
This reverts commit 36c99a358f.
 2012-09-20 20:39:02 -04:00
Mark Story
f4a639cbfa Merge pull request #862 from bar/mysql-fulltext 
Add MySQL FULLTEXT support.

Fixes #262
 2012-09-20 17:20:23 -07:00
Mark Story
e931211fcc Merge pull request #858 from dereuromark/2.3-request 
adding query() for CakeRequest
 2012-09-20 06:40:23 -07:00
Ber Clausen
36c99a358f Add MySQL FULLTEXT support. 
Minor optimizations and testing added.
 2012-09-20 00:35:42 -03:00
mark_story
3dd82e6d88 Fix Database/ from always being appended to the driver name. 
Fixes #3223
 2012-09-19 20:55:39 -04:00
euromark
0be1943bcd adding basic test 2012-09-20 01:56:52 +02:00
euromark
213d4caa85 coding standards 2012-09-20 01:50:15 +02:00
euromark
8a070ca3dd doc block 2012-09-20 01:45:05 +02:00
euromark
3fa6b96ad0 adding CakeNumber::formatDelta() and fixing issue with near-zero values and format() 2012-09-20 01:41:41 +02:00
ADmad
d12f50a2b6 Removing unneeded App::uses() calls 2012-09-20 02:40:54 +05:30
mark_story
0f0b5e7668 Fix incorrect radio selection with falsey values. 
Use strval() to work around 0 == '' type issues.
Cleanup some tests.

Fixes #3221
 2012-09-19 10:14:29 -04:00
euromark
60385d1d28 test the query() method with arrays passed via $_GET 2012-09-19 03:14:55 +02:00
mark_story
99cbd22969 Fix coding standards. 2012-09-18 14:52:46 -04:00
mark_story
da6d49e554 Fix code conventions. 2012-09-18 14:50:03 -04:00
mark_story
5d830d7adb Fix multiple selects always failing post validation. 
Fixes #3218
 2012-09-18 14:41:51 -04:00
mark_story
a1838a0c85 Implement missing bits for automatic sequence resetting. 
Refs #3206
 2012-09-18 14:12:23 -04:00
Mark Story
5d4a6fd6b6 Merge pull request #856 from ceeram/2.3-cakenumber 
Simplify and improve fromReadableSize().
 2012-09-18 10:55:28 -07:00
euromark
e8cfac0eec adding query() for CakeRequest 2012-09-18 19:38:53 +02:00
Ceeram
ff676b5ea4 allow for lowercase as well, also strip the unit part off before pow() 2012-09-18 17:15:33 +02:00
Mark Story
144761c0b2 Merge pull request #852 from cakephp/2.3-reset-sequence 
Implement resetSequence()

Fixes #3206
 2012-09-18 07:42:11 -07:00
Dave
46035cfd73 Update lib/Cake/View/Helper/FormHelper.php 2012-09-18 10:56:36 -03:00
Dave
990d5f89f0 Update lib/Cake/View/Helper/FormHelper.php 2012-09-18 10:51:24 -03:00
Tigran Gabrielyan
d30e092966 Fixed test case 2012-09-18 00:46:06 -07:00
Tigran Gabrielyan
f1a344eee4 Added test case for view block default value 2012-09-18 00:41:33 -07:00
Tigran Gabrielyan
6d98069f13 Added ability to set default view block content 2012-09-18 00:41:30 -07:00
Ceeram
90c32add9c opmitisation of fromReadableSize 2012-09-18 09:34:05 +02:00
Mark Story
07c5102de5 Merge pull request #850 from ceeram/2.2-filesize 
Add CakeNumber::fromReadableSize() and Validation::filesize()
 2012-09-17 17:55:23 -07:00
mark_story
55dcb9c3b3 Implement resetSequence() 
This is an optional method in DboSource that allows datasources to
resetSequence values in tables.  This is useful for datasources like
Postgres, and makes using fixtures much easier.

Fixes #3026
 2012-09-17 20:50:05 -04:00
Ceeram
9530e68ae6 add default return value as parameter to use when size can not be determined 2012-09-17 13:21:50 +02:00
Mark Story
cdfead0feb Merge pull request #849 from dogmatic69/rijndael-fatal-error 
skipping the rijndael test if mcrypt_encrypt() is not available
 2012-09-15 18:00:07 -07:00
dogmatic69
26934236b1 skipping the rijndael test if mcrypt_encrypt() is not available 2012-09-15 11:43:39 +01:00
dogmatic69
d0bb8a94b4 die() to exit() 2012-09-15 11:20:51 +01:00
dogmatic69
4899b5b91b changing is_writeable() to is_writable() 2012-09-15 11:17:35 +01:00
dogmatic69
aa87791432 replacing is_integer() with is_int() 2012-09-15 11:15:01 +01:00
dogmatic69
a38a616cba changing join() to implode() for consistency 2012-09-15 11:06:02 +01:00
mark_story
ccd33782da Fix whitespace errors. 2012-09-14 22:37:39 -04:00
mark_story
d6e2b6f83e Re-format long lines. 2012-09-14 22:08:52 -04:00
Mark Story
89c98233b5 Merge pull request #843 from dereuromark/2.3-ticket-3172 
check() for CookieComponent and Configure
 2012-09-14 18:22:34 -07:00
euromark
6d3e0a25b2 save some memory usage (PHP < 5.4) in case of huge content and cut off the isset call 2012-09-15 02:33:05 +02:00
Mark Story
a5481f1c2c Merge pull request #839 from dogmatic69/cleanup-request-handler 
Cleaning up the RequestHandlerCompoent
 2012-09-14 12:36:39 -07:00
dogmatic69
f5a8eb6bbf ADmads comments 2012-09-14 19:57:51 +01:00
dogmatic69
cfadc4dbb0 strict type checks and removing some duplicate count() calls by setting a variable 2012-09-14 19:26:00 +01:00
dogmatic69
5cc03ca805 converting if($foo == true) to if($foo) 2012-09-14 18:54:29 +01:00
dogmatic69
22a2e1b51e converting $foo == / $foo == 0 to !$foo (and a few $foo === 0) 2012-09-14 18:42:25 +01:00
dogmatic69
cf8fccae96 converting $foo == null / $foo == false to !$foo 2012-09-14 18:26:30 +01:00
dogmatic69
e09bf02467 Cleaning up the RequestHandlerCompoent 
removing redundant code and shifting a few things around so there
are less nested ifs and making things easier to follow.

Removing some variable setting, returning function calls instead.
 2012-09-14 17:19:40 +01:00
Mark Story
ec4333de29 Merge pull request #845 from dogmatic69/security-component-cleanup 
You cant pass func_get_args() in PHP < 5.3
 2012-09-14 08:17:11 -07:00
dogmatic69
c7faad9f78 You cant pass func_get_args() in PHP < 5.3 2012-09-14 15:29:48 +01:00
dogmatic69
6f3e6c10a1 Adding a check to the object before use 
For some reason that I have not been able to figure out yet the object is
returned as null.  This is causing some exceptions when trying to access
properties that dont exist.

FatalErrorException: "Call to a member function getAssociated() on a non-object"

Test still pass with the added check.
 2012-09-14 14:54:10 +01:00
mark_story
0282194c20 Make permission denied redirects host relative. 
This helps fix infinite redirect loops when HTTP_X_FORWARDED_HOST is
set, and fixes redirects back to external domains on authentication
errors.

Fixes #3207
 2012-09-14 09:39:45 -04:00
Renan Gonçalves
d33f676ddd Handling a fatal error on console should call Shell::_stop(1). 
Just like we do on web, any exception or fatal error will result into a InternalErrorException/FatalErrorException.
 2012-09-14 14:17:07 +02:00
mark_story
7d2cbec79d Revert "Fix null not stopping model callbacks." 
This reverts commit 82a8400def.

The previous change broke a number of tests as existing tests expect
that a return value of null will not stop events.
 2012-09-13 22:49:17 -04:00
mark_story
82a8400def Fix null not stopping model callbacks. 
Add a compatibility shim into CakeEventManager to fix `null` not
breaking model callbacks.  This was a regression created when model
callbacks were re-factored to use the event manager. This code should be
removed in 3.x as its inconsistent with events used everywhere else in
the framework.

Fixes #3123
 2012-09-13 22:11:46 -04:00
Mark Story
1fe791353f Merge pull request #840 from dogmatic69/cleanup-auth-component 
Cleaning up the AuthComponent
 2012-09-13 18:21:51 -07:00
mark_story
c13ed3366b Fix whitespace errors. 2012-09-13 21:06:14 -04:00
Mark Story
5081be171f Merge pull request #821 from dereuromark/2.3-folder-merge 
allow Folder to merge recursivly and add scheme option
 2012-09-13 18:00:02 -07:00
mark_story
921c2c67ab Fix strict error in 5.4 2012-09-13 20:59:17 -04:00
dogmatic69
2c70319d27 Cleaning up the AuthComponent 
Simplify if statements, return early and less variable use
 2012-09-14 01:50:24 +01:00
mark_story
ec54fa57c5 Merge branch 'simplify-cake-time' into 2.3 
Conflicts:
	lib/Cake/Utility/CakeTime.php
 2012-09-13 20:45:59 -04:00
Mark Story
51e0715001 Merge pull request #838 from dogmatic69/security-component-cleanup 
cleaning up the code, removing extra variables set and un-needed else
 2012-09-13 14:50:37 -07:00
Mark Story
f22d4c016e Merge pull request #837 from dogmatic69/paginator-component-cleanup 
Cleaning up the paginator component by removing extra else statements and shifting code around.
 2012-09-13 14:48:33 -07:00
Mark Story
31ca237709 Merge pull request #831 from dogmatic69/sanitize-regex-cleanup 
adjusting the way the regex is done so its easier to read
 2012-09-13 14:41:36 -07:00
Mark Story
0f8262ec45 Merge pull request #833 from dogmatic69/simplify-class-registry 
Simplify the ClassRegistry by removing else, and adding early returns
 2012-09-13 14:39:37 -07:00
Mark Story
051362a734 Merge pull request #836 from dogmatic69/simplify-object-collection 
PHP 5.4 strict error fix
 2012-09-13 14:37:40 -07:00
dogmatic69
95b895b19a Simplify the cake time class 
Removed a lot of nested ?: code and nested if/else statements broken down
with early return. Moving a few variables lower down the function calls as
there are times when they are not even needed.

Also removed setting variables that are returned on the next line.
 2012-09-13 22:17:01 +01:00
dogmatic69
bf18fc4dda cleaning up the code, removing extra variables set and un-needed else 2012-09-13 22:10:57 +01:00