Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Loading…

Add the other translation shortcuts for context support #4023

Merged
merged 1 commit into from

5 participants

@Marlinc

No description provided.

@markstory markstory added this to the 2.6.0 milestone
@josegonzalez
Collaborator

@markstory @lorenzo thoughts?

@markstory
Owner

Seems reasonable to me. I wonder if @lorenzo has plans to keep c functions in the i18n changes for 3.0. I know that domains for example are being obsoleted.

@ADmad
Collaborator

I know that domains for example are being obsoleted.

The use of LC_* categories is going to be removed in 3.0 not domains.

@markstory
Owner

Ah I was confused then.

@ADmad ADmad commented on the diff
lib/Cake/basics.php
((7 lines not shown))
+
+}
+
+if (!function_exists('__xn')) {
+
+/**
+ * Returns correct plural form of message identified by $singular and $plural for count $count.
+ * Some languages have more than one form for plural messages dependent on the count.
+ *
+ * @param string $context Context of the text
+ * @param string $singular Singular text to translate
+ * @param string $plural Plural text
+ * @param integer $count Count
+ * @param mixed $args Array with arguments or multiple arguments in function
+ * @return mixed plural form of translated string
+ * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__n
@ADmad Collaborator
ADmad added a note

Link is incorrect. Could change the fragment to #__xn assuming that section will be added.

@Marlinc
Marlinc added a note

Ah I see, all links seem to be wrong. Should I add the right anchor to all of the links or would it be better if I remove the links entirely.

@lorenzo Owner
lorenzo added a note

@Marlinc just remove the links

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
@lorenzo
Owner

Merging this as I need to work on the replacement functions for 3.0

@lorenzo lorenzo merged commit 9295791 into cakephp:2.6

1 check passed

Details continuous-integration/travis-ci The Travis CI build passed
@patrickconroy patrickconroy referenced this pull request from a commit in patrickconroy/cakephp
Patrick Conroy Squashed commit of the following:
commit f13c3412c1bdb8ed916d867e4171bad6d198e7c1
Merge: 8542e7a bd911c0
Author: ADmad <admad.coder@gmail.com>
Date:   Mon Aug 25 21:05:14 2014 +0530

    Merge pull request #4376 from kimegede/risky-test-fix

    Risky test fix

commit bd911c01c89aea13bef83f6f503b6131e264d622
Author: Kim Egede Jakobsen <kimegede@gmail.com>
Date:   Mon Aug 25 15:45:19 2014 +0200

    Test flash message with custom id.

commit a28717983d24c49689b52d5bcb2f2a5c0e12339c
Author: Kim Egede Jakobsen <kimegede@gmail.com>
Date:   Mon Aug 25 15:44:24 2014 +0200

    Asserting "hack" to avoid "Risky" test result.
    (When the test was made, it was throwing an error, it isn't anymore :))

commit 188b8886504574543dda5dd1a9fed8d3076f25c7
Author: Kim Egede Jakobsen <kimegede@gmail.com>
Date:   Mon Aug 25 15:43:32 2014 +0200

    ResultSetTest now tests that the result is kept.

commit 81e9e7d986b566d4da49ac6e8e52ac486d9486cf
Author: Kim Egede Jakobsen <kimegede@gmail.com>
Date:   Mon Aug 25 15:42:11 2014 +0200

    Removed testAuthNoAuth() as it was useless.

    $this->any() could be changed to $this->never() and still work.
    If using $this->once() it failed, as write() never was triggered.

commit 1a4eae3ee80a06de8260deca207f2d63bd42037e
Author: Kim Egede Jakobsen <kimegede@gmail.com>
Date:   Mon Aug 25 15:41:34 2014 +0200

    Renamed testProvider() to ExceptionProvider().
    And updated docblock

commit 8542e7ab970595699d06e8366c2a01c13ab90b0d
Merge: 1951b16 6b02f80
Author: Mark S. <euromark@web.de>
Date:   Mon Aug 25 11:46:14 2014 +0200

    Merge pull request #4356 from cakephp/3.0-shells

    3.0 shells

commit 17d8b94ff5ac8d753d5f2efcc2bd5f4b76f54ccd
Author: Kim Egede Jakobsen <kimegede@gmail.com>
Date:   Sun Aug 24 17:27:14 2014 +0200

    Added assertion for PluginTest::testIgnoreMissingFiles()

commit 6b02f80b10e6a472c1b46a4b7e62fceb0ff13a9a
Author: euromark <euromark@web.de>
Date:   Mon Aug 25 11:35:38 2014 +0200

    Move Console Shells and Tasks.

commit 1951b16d31024623b43036cce6a7119ed668cc4d
Merge: 986e8db 4a71693
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Sun Aug 24 18:39:44 2014 +0200

    Merge pull request #4375 from cakephp/3.0-collection-subtree

    3.0 collection subtree

commit 4a716938b7fe71f091cba32b00a2e2cb14c22471
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Sun Aug 24 18:29:52 2014 +0200

    Adding a replace map in the main composer.json

commit f7af8b706cd05dcfd69def9a2373648340d820c6
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Sun Aug 24 18:26:52 2014 +0200

    Added markdown link instead of using plain url in Collection readme

commit 1eb0bd5b3c296b2e9f2b539039da7d71efa8349d
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Sun Aug 24 18:00:29 2014 +0200

    Adding a readme for the collections library

commit 141c3f1ddc54b6afdfb85ca425bc0abc9710eb14
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Sun Aug 24 18:00:17 2014 +0200

    Adding a composer file

commit 986e8dbedc6e212210d93dd0676ba968b5353377
Merge: f11629f 55d8475
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Sun Aug 24 17:17:59 2014 +0200

    Merge pull request #4374 from kimegede/cache-test-update

    Cache test update

commit 55d8475547eb9011e7d16413ebf654ac3ca93ec5
Author: Kim Egede Jakobsen <kimegede@gmail.com>
Date:   Sun Aug 24 16:36:59 2014 +0200

    Made assertions in testNonFatalErrorsWithCacheDisable.
    To avoid "R" (Risky)  in phpunit.

commit 3c8dd8285bac42acac1635d74cc893f9ee8335a1
Author: Kim Egede Jakobsen <kimegede@gmail.com>
Date:   Sun Aug 24 16:36:48 2014 +0200

    Added docblock to _configCache()

commit f11629f2ff6d94c780b5e0694a86965733893008
Merge: ffd313b c2b9625
Author: Mark Story <mark@mark-story.com>
Date:   Sun Aug 24 14:43:59 2014 +0200

    Merge pull request #4367 from bcrowe/3.0-missing-period

    3.0 - Added missing period in Behavior class

commit c2b962514a43b26520ca85aac0310b28baf392b5
Author: Bryan Crowe <bryan@bryan-crowe.com>
Date:   Sun Aug 24 14:41:31 2014 +0200

    Added missing period in Behavior class

commit ffd313bb4369979d3d301d9e8f40d1e8801e2389
Merge: db7d9f6 ee4eff1
Author: Mark Story <mark@mark-story.com>
Date:   Sun Aug 24 14:29:41 2014 +0200

    Merge pull request #4362 from cakephp/3.0-random-uuids

    Generating true random v4 UUIDs.

commit db7d9f65202a80e018d8f7fe356a93046c1813fd
Merge: 0667917 82532ad
Author: Mark Story <mark@mark-story.com>
Date:   Sun Aug 24 14:29:01 2014 +0200

    Merge pull request #4365 from AD7six/3.0-blacklist-GOP

    blacklist getOptionParser

commit 82532ad3c1b69bfd75fbec212f7f9a92a110bcc6
Author: AD7six <andydawson76@gmail.com>
Date:   Sun Aug 24 12:17:16 2014 +0000

    blacklist getOptionParser to prevent:

    	Console/cake orm_cache<tab>
    	build            clear            getOptionParser

commit ee4eff1221ca9888370347e9040d8349aa398d85
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Sun Aug 24 14:09:40 2014 +0200

    Specifying the uuid version we generate

commit b08e0c2e167b98b559b678725e5b1a1d8cc8be48
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Sun Aug 24 12:36:35 2014 +0200

    Generating true random v4 UUIDs.

    This also makes the String::uuid() 3 times faster

commit 06679170f94722907e2b625b85ff3327333f1549
Merge: 3451bf4 038c16b
Author: Mark Story <mark@mark-story.com>
Date:   Sun Aug 24 12:17:33 2014 +0200

    Merge pull request #4361 from cakephp/3.0-random-database-improvements

    A few random improvements to the database layer

commit 038c16b2de47736237a8742ad23fb9f5d7a3435d
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Sun Aug 24 11:50:30 2014 +0200

    A few random improvements to the database layer

commit 3451bf4fd5c509e8a0e24869d23c7113b9adc1e8
Merge: 036c21a 707c88a
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Sat Aug 23 20:47:46 2014 +0200

    Merge pull request #4357 from bcrowe/3.0-CS

    3.0 - Fix CS errors

commit 707c88a2686f8aeec66710009839f619e56fe946
Author: Bryan Crowe <bryan@bryan-crowe.com>
Date:   Sat Aug 23 20:28:44 2014 +0200

    Fix CS errors

commit 036c21a53f3650af0c5800ef1d3b48540a25ea7d
Merge: 8e28b7c 70fbaad
Author: Mark Story <mark@mark-story.com>
Date:   Sat Aug 23 19:33:04 2014 +0200

    Merge pull request #4354 from bcrowe/3.0-short-echo

    3.0 - Fix short echo CS in bake class templates

commit 70fbaadde33893c075ff54d0790488b483372d72
Author: Bryan Crowe <bryan@bryan-crowe.com>
Date:   Sat Aug 23 18:59:20 2014 +0200

    Fix short echo CS in bake class templates

commit 8e28b7c2770b2b8933c8dc176e9cfb82f7527a57
Author: mark_story <mark@mark-story.com>
Date:   Sat Aug 23 17:33:39 2014 +0200

    Fix incorrect type detection when ajax + json are available.

    Make ajax happen after content-type negotiation so that when jQuery
    talks to CakePHP the requests don't get marked as ajax and instead get
    marked as json.

commit 0ccbfcfe4c1d75a921ea46547eed9bcff100454d
Merge: ec65de0 6cb9d45
Author: ADmad <admad.coder@gmail.com>
Date:   Sat Aug 23 17:19:49 2014 +0530

    Merge pull request #4352 from cakephp/findType-consistency

    Change findType to finder in PaginatorComponent.

commit ec65de0dd51e82a375157505b236758807e4da5d
Author: mark_story <mark@mark-story.com>
Date:   Sat Aug 23 11:25:45 2014 +0200

    Update version number to 3.0.0-beta1

commit 6cb9d453bb303352797168179baa3c7d75072d89
Author: mark_story <mark@mark-story.com>
Date:   Sat Aug 23 11:23:10 2014 +0200

    Change findType to finder in PaginatorComponent.

    Having everything be consistent is good and nice. I've left behind
    compatibility with `findType` as unlike CounterCache and Associated
    finders, PaginatorComponent is a bit more widely used and is harder to
    change.

commit 425faaaf32222868adba8c9e256bf13f5d815b43
Merge: a8441dc 5d53868
Author: Mark Story <mark@mark-story.com>
Date:   Sat Aug 23 10:51:53 2014 +0200

    Merge pull request #4342 from cakephp/3.0-association-custom-finder

    3.0 association custom finder

commit 5d53868b5b00708a0a813db508dcbb2774806d76
Author: mark_story <mark@mark-story.com>
Date:   Sat Aug 23 10:37:17 2014 +0200

    Fix failing test.

commit 684d556e34a5a98192ff19f77b360d251bb7337b
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Sat Aug 23 09:41:42 2014 +0200

    Adding a test case for using a custom finder for associations

commit a8441dc3d57e525bdae1a57ef1fecf3c37c73f26
Merge: 2fe3785 4a805af
Author: mark_story <mark@mark-story.com>
Date:   Sat Aug 23 09:21:31 2014 +0200

    Merge remote-tracking branch 'origin/2.6' into 3.0

    Conflicts:
    	lib/Cake/Console/Command/Task/PluginTask.php
    	lib/Cake/Test/Case/Console/Command/Task/PluginTaskTest.php
    	lib/Cake/Test/Case/Utility/CakeTimeTest.php
    	lib/Cake/Utility/CakeTime.php

commit 4a805af5c6e0e6f89552e1f1dd402e87675f9857
Merge: 4e4477b 0400a63
Author: mark_story <mark@mark-story.com>
Date:   Sat Aug 23 09:20:19 2014 +0200

    Merge branch 'master' into 2.6

commit 2fe3785d85f4a3fcf1b707cb04c0e4d2e063de9d
Merge: 7b26656 52c2674
Author: Mark Story <mark@mark-story.com>
Date:   Sat Aug 23 09:13:54 2014 +0200

    Merge pull request #4345 from cakephp/router-extensions-fix

    Router extensions fix

commit 7b2665638a3fa4edb1a9954029724b69eefc5b90
Merge: 1b7ec8c 04bb238
Author: Mark Story <mark@mark-story.com>
Date:   Sat Aug 23 09:13:12 2014 +0200

    Merge pull request #4348 from dereuromark/3.0-typehint

    Better typehinting.

commit 1b7ec8ce7e6961552d1851c6eaa58aebe601507d
Merge: 6fa6d76 34065e4
Author: Mark Story <mark@mark-story.com>
Date:   Sat Aug 23 09:12:22 2014 +0200

    Merge pull request #4316 from cakephp/3.0-fix-session-regenerate

    Avoiding a call to session_regenerate_id() when there is no id

commit 52c2674e45b775d9252eedfc1f9c4060a88974b5
Author: mark_story <mark@mark-story.com>
Date:   Sat Aug 23 00:44:12 2014 +0200

    Add missing type to api docs.

commit 04bb238324e65382256c77df0a54c3c424e3ae78
Author: euromark <euromark@web.de>
Date:   Fri Aug 22 20:45:49 2014 +0200

    fix test

commit 431088d5e0fbe47b57e04971968a9f3c118c6dd8
Author: euromark <euromark@web.de>
Date:   Fri Aug 22 20:37:41 2014 +0200

    Better typehinting.

commit 0e009ab613a25ebd140a4f307aaa0b8ae8dd3eba
Author: mark_story <mark@mark-story.com>
Date:   Fri Aug 22 17:58:15 2014 +0200

    Remove a bunch of dead code.

    This code is basically garbage and does nothing.

commit 5f5afb7d7f1743144d1914855a74c767fde8779f
Author: mark_story <mark@mark-story.com>
Date:   Fri Aug 22 17:57:49 2014 +0200

    Fix issue where Router::extensions() would not be correct.

    Due to the way routes are now incrementally built and added to the
    collection, Router lost the plot around which extensions existed. By
    moving the extension list into the RouteCollection and incrementally
    build out the extension list as routes are added we can have the correct
    list of extensions. This is important for the few places that
    Router::extensions() is still used.

commit c89dc17788c0f0c4491d4ff1bffad0797ae5be6c
Author: mark_story <mark@mark-story.com>
Date:   Fri Aug 22 17:38:41 2014 +0200

    Rename Route::parseExtensions() to Route::extensions()

    Having the same method names across RouteBuilder, and Route make it
    easier to remember which method is correct. Additionally, the
    RouteCollection will also be getting an extensions method.

commit 817cc7782199aaa738868858b112bd54aa7bd4a1
Author: mark_story <mark@mark-story.com>
Date:   Fri Aug 22 17:37:47 2014 +0200

    Fix issue where RouterBuilder::scope() would not allow 2 arguments.

commit 6fa6d767f4f8a47334e406cccc74217602499139
Merge: 158156e 3497a49
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Fri Aug 22 12:54:49 2014 +0200

    Merge pull request #4340 from cakephp/schema-name

    Schema name for postgres and sqlserver

commit b82a09f359e681e377f9cb4386a1e677516611d2
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Fri Aug 22 12:48:29 2014 +0200

    Using Association::find() in Association::attachTo()

    This allows us to use defined custom finders even for joinable associations.
    Removed unit tests that were hard to follow and were fragile, the code
    they covered is also covered by a few integration tests.

commit 158156e2bc99ce3259370b8ea39f0956b738fa58
Merge: a106f21 3f2b62a
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Fri Aug 22 12:23:09 2014 +0200

    Merge pull request #4341 from bcrowe/3.0-bake-views-cs

    3.0 - Fix short echo CS in view bake templates

commit 06f727e6287d35fba8a64c37623651be075dac1b
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Fri Aug 22 12:08:01 2014 +0200

    Renamed option in CounterCache from finderType to finder

commit a106f218e087592154e969d34401c2c47b5d9261
Author: mark_story <mark@mark-story.com>
Date:   Fri Aug 22 12:05:25 2014 +0200

    Try and fix the release package uploading issues.

commit 190f10f739ccf92f2f8edf0ab95cc29f186574e2
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Fri Aug 22 12:00:49 2014 +0200

    Adding some doc blocks

commit 94fef9ff4c541dde30da6d613ed5e60e24dbebf3
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Fri Aug 22 11:58:55 2014 +0200

    Using th edefault finder method in Association

commit 3f2b62ae604f7000adfb2263080aa7070a3036f8
Author: Bryan Crowe <bryan@bryan-crowe.com>
Date:   Fri Aug 22 11:58:48 2014 +0200

    Fix short echo CS in view bake templates

commit fb4536337219d9bda7196c723dd8cf780ba2762e
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Fri Aug 22 11:57:58 2014 +0200

    Starting to add the new finder method in Association

commit 6ce18474dc90a1834428df373360ac81ce69b7a5
Merge: b486152 5319e3c
Author: Mark Story <mark@mark-story.com>
Date:   Fri Aug 22 11:44:55 2014 +0200

    Merge pull request #4338 from robertpustulka/3.0-cascade-callbacks

    3.0 accessible cascadeCallbacks in Association

commit 3497a494d7fc3fcee705aa83da14097cd703daaf
Author: mark_story <mark@mark-story.com>
Date:   Fri Aug 22 11:27:05 2014 +0200

    Add tests for postgres + sqlserver schema.table names.

    Both postgres and sqlserver databases frequently use multiple schemas.
    As per #3924 and #3914 both sqlserver and postgres support
    `schema.table` style table names allowing specific models to use tables
    on schemas outside of the default schema.

commit b486152c5bb7d692de220bef1893c5a0cd30d5c1
Merge: 53596d4 bbc2a63
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Fri Aug 22 11:18:26 2014 +0200

    Merge pull request #4339 from bcrowe/3.0-table-bake

    3.0 - Remove extra newline in table bake when no associations

commit bbc2a63cd25e9f38b0400326b7193e2155239b14
Author: Bryan Crowe <bryan@bryan-crowe.com>
Date:   Fri Aug 22 11:01:28 2014 +0200

    Remove extra newline in table bake when no associations

commit 5319e3c959849698ee9fb401572f27e266a30e1e
Author: Robert <r.pustulka@zano.pl>
Date:   Fri Aug 22 11:00:33 2014 +0200

    cascadeCallbacks() doc updated

commit 53596d4340a9cf27a6ebb2f5bda65af024c9e322
Merge: 5e86f63 2d86edc
Author: Mark Story <mark@mark-story.com>
Date:   Fri Aug 22 10:48:26 2014 +0200

    Merge pull request #4337 from alecho/patch-1

    removes confusing language

commit 5e86f63c6985dcb28a1a6935d6f69dbb6580e3aa
Merge: 420b703 67eb9a9
Author: Mark Story <mark@mark-story.com>
Date:   Fri Aug 22 10:48:01 2014 +0200

    Merge pull request #4336 from ravage84/aclcomponent-removed

    Deleted @property reference to removed AclComponent

commit 420b70326cbd16237eb99cf3f94a91c52ffb763a
Merge: c38005d ceb7a24
Author: Mark Story <mark@mark-story.com>
Date:   Fri Aug 22 10:47:43 2014 +0200

    Merge pull request #4335 from cakephp/3.0-no-id-in-form

    Do not generate a primary key input field in baked forms

commit 709cbab79555ad0a32e99411c9fd7743a29de22c
Author: Robert <r.pustulka@zano.pl>
Date:   Fri Aug 22 10:45:12 2014 +0200

    Added cascadeCallbacks accessor/mutator test

commit 9085ebb325143721c74e5c21a9513774e5637577
Author: Robert <r.pustulka@zano.pl>
Date:   Fri Aug 22 10:45:01 2014 +0200

    Added cascadeCallbacks accessor/mutator

commit 2d86edc00b0239c2abf3e64045fa4396a03d073e
Author: Andrew Lechowicz <andrew@alecho.com>
Date:   Fri Aug 22 10:20:43 2014 +0200

    removes confusing language

     removes confusing language about if a cell action is required

commit bd0daa5dca38954bbb014c2b3429e55586a7aeac
Author: MichalWadowski <michal.wadowski@awanser.pl>
Date:   Thu Jul 10 08:34:33 2014 +0200

    Enable CakePHP ORM to accept PostgreSQL and SQL Server schema.

commit 67eb9a9efba5e67a8a36748ebb7c44d50791edf8
Author: Ravage84 <ravage@bluewin.ch>
Date:   Fri Aug 22 10:17:03 2014 +0200

    Deleted @property reference to removed AclComponent

    Was forgotten in https://github.com/cakephp/cakephp/commit/5ddda55246a23ce4813b3f47e6ca5a0a1c8dad5e

commit ceb7a24f67aabae2148a6190b052448e8f5e3c06
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Fri Aug 22 10:13:15 2014 +0200

    Do not generate a primary key input field in baked forms as that is
    not required anymore.

commit c38005dc7a2925c3252dbb5958e9854c370b14c7
Merge: 43f0ca0 ce53fe8
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Fri Aug 22 10:06:25 2014 +0200

    Merge pull request #4334 from cakephp/issue-4330

    Fix validation callbacks without a provider

commit ce53fe8371d4a3a7f795ceeecb43cd3f1d56ffbb
Author: mark_story <mark@mark-story.com>
Date:   Fri Aug 22 09:56:03 2014 +0200

    Unskip a few test cases.

commit 22d2e326c076fc9e505c67fa4e66ed70c30b237b
Author: mark_story <mark@mark-story.com>
Date:   Fri Aug 22 09:44:18 2014 +0200

    Unskip test.

    The path to the file was wrong, so the test was skipped.

commit a3d7d2aaaaf08387d351995187b9b1f7a77c6f6a
Author: mark_story <mark@mark-story.com>
Date:   Fri Aug 22 09:43:56 2014 +0200

    Fix callable arrays being mishandled by ValidationRule.

    We should not be manipulating callable arrays like normal validation
    rule arrays.

    Refs #4330

commit 34065e419fcf24674071ec334be8003d45f66b9c
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Fri Aug 22 09:29:52 2014 +0200

    Making sure the session is started before the id is regenerated

commit 43f0ca023abdaac12a083d09cab3bf9a0e425dc9
Merge: e9dd234 b2ed6a2
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Fri Aug 22 09:16:29 2014 +0200

    Merge pull request #4329 from cakephp/issue-4307

    Fix 0/'0' not being patched properly.

commit e9dd234ef72644f972751608d8d13f5b2fceb7de
Author: mark_story <mark@mark-story.com>
Date:   Fri Aug 22 00:59:49 2014 +0200

    Fix failing tests on windows.

    Windows uses " not ' to escape shell arguments.

commit 5bce314a863a3f155972542970f89d55ac650126
Merge: 73787fc 2818ee6
Author: Mark Story <mark@mark-story.com>
Date:   Fri Aug 22 00:48:54 2014 +0200

    Merge pull request #4298 from php-engineer/3.0-flash-component

    FlashComponent Bugfix

commit 73787fc3b01a25b1dbc75441b8c13897343d4068
Merge: b6cbb57 16e6dc8
Author: Mark Story <mark@mark-story.com>
Date:   Fri Aug 22 00:41:13 2014 +0200

    Merge pull request #4319 from cakephp/3.0-hack-and-deprecate

    Temporary workaround for #4313

commit b6cbb576575e63919ac60cff83681a99d4d7eb44
Merge: c0883c9 4f0d501
Author: Mark Story <mark@mark-story.com>
Date:   Fri Aug 22 00:40:12 2014 +0200

    Merge pull request #4314 from cakephp/3.0-exception-logging

    Add some white space to error logs for better readability.

commit c0883c9c13133f920bac9b1c17ec0d365e954ba9
Merge: 2e56058 e57de08
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Thu Aug 21 22:29:57 2014 +0200

    Merge pull request #4323 from cakephp/issue-4321

    Fix several small issues

commit 2818ee6339c7f1acb2d451c0ad78b635db175299
Author: Stefan Dickmann <stefan@php-engineer.de>
Date:   Thu Aug 21 18:46:21 2014 +0200

    flash component bugfix

commit 2e56058c4543278f545f96a2d8a7e2b0def0cd7f
Merge: 7328a26 89bb1fa
Author: Mark Story <mark@mark-story.com>
Date:   Thu Aug 21 18:19:36 2014 +0200

    Merge pull request #4328 from renan/3.0-mysql-multiple-init

    Executing multiple init commands rather than using PDO::MYSQL_ATTR_INIT_COMMAND

commit e57de08d3c48e87a54b3adbe2ab0c9e909e53db6
Author: mark_story <mark@mark-story.com>
Date:   Thu Aug 21 18:17:54 2014 +0200

    Exceptions need to be instances.

commit b2ed6a289e40ed12509a0364a09e0610e667e377
Author: mark_story <mark@mark-story.com>
Date:   Thu Aug 21 18:03:51 2014 +0200

    Fix 0/'0' not being patched properly.

    Use strict equality when comparing scalar values. We don't want to use
    strict equality on object types as DateTime instances will *always* be
    different, as will arrays holding associated entities.

    Refs #4307

commit 89bb1fab08045b8c195b52df6f5cba707f60286d
Author: Renan Gonçalves <renan.saddam@gmail.com>
Date:   Thu Aug 21 17:59:51 2014 +0200

    Executing multiple init commands rather than using PDO::MYSQL_ATTR_INIT_COMMAND.
    PDO::MYSQL_ATTR_INIT_COMMAND does not support multiple commands as reported in https://bugs.php.net/bug.php?id=48859

commit 7328a266aa55c2ce43954a13c86cfedddf69706c
Merge: 3d55158 f2d1bb3
Author: Mark Story <mark@mark-story.com>
Date:   Thu Aug 21 16:32:35 2014 +0200

    Merge pull request #4326 from renan/3.0-autoload-dev

    Testing namespaces should be under autoload-dev

commit 4f0d501cfc63e09809bba8e57155d87d52053a96
Author: ADmad <admad.coder@gmail.com>
Date:   Thu Aug 21 19:02:45 2014 +0530

    Fix testcase.

commit f2d1bb3a3a92c876e01434fd37e27e035bb91b21
Author: Renan Gonçalves <renan.saddam@gmail.com>
Date:   Thu Aug 21 15:19:38 2014 +0200

    Testing namespaces should be under autoload-dev.

commit 3d551589801f8b92178b8dfec4209cf0dae52d9e
Merge: 2989fd2 f56739c
Author: ADmad <admad.coder@gmail.com>
Date:   Thu Aug 21 16:41:03 2014 +0530

    Merge pull request #4325 from davidyell/patch-4

    3.0 Update missing_behavior.ctp

commit f56739c532805d2fa0050a5379c187a3436b641b
Author: David Yell <neon1024@gmail.com>
Date:   Thu Aug 21 10:38:51 2014 +0100

    Update missing_behavior.ctp

    The class needs to extend `Behavior` as that's the name of the class.

commit 2989fd209386983e8d3b2b02c5681ebd298b3c6e
Merge: e02e4f3 ca50734
Author: Mark S. <euromark@web.de>
Date:   Thu Aug 21 11:25:40 2014 +0200

    Merge pull request #4324 from bcrowe/3.0-behavior-typo

    3.0 - Fix typo in Behavior doc block

commit ca50734156aef23b4cb1b6b0278f280d9b613545
Author: Bryan Crowe <bryan@bryan-crowe.com>
Date:   Thu Aug 21 11:21:52 2014 +0200

    Fix typo in Behavior doc block

commit f7597d4327c8eb45790aad6dfa703cc152a31cfa
Author: mark_story <mark@mark-story.com>
Date:   Thu Aug 21 10:37:50 2014 +0200

    Re-add SQL to Query exports.

    More than just Query objects can raise exceptions in their __debugInfo
    method. Debugger should be catching and gracefully handling that
    situation.

commit bcd672f3eb30207b4bf65a447d445fcf75437d47
Author: mark_story <mark@mark-story.com>
Date:   Thu Aug 21 07:48:47 2014 +0200

    Fix missing property definition.

commit 16c84176408f91a123c8b6d0d57d678b0fb21065
Author: mark_story <mark@mark-story.com>
Date:   Thu Aug 21 00:42:36 2014 +0200

    Fix failing tests.

    Because queries are not compiled when debugInfo is run, the parameters
    may not be complete.

commit af6208c9cca459c44049e5de6730e2993f7fb149
Author: mark_story <mark@mark-story.com>
Date:   Thu Aug 21 00:36:56 2014 +0200

    Automatically decompress gzip response bodies when possible.

    If gzinflate() exists and a gzip response body is encountered, the
    response body should automatically be decompressed.

commit 0c55ad8ed1c946c4003d4097f2d17be2c44a3f3a
Author: mark_story <mark@mark-story.com>
Date:   Thu Aug 21 00:16:04 2014 +0200

    Remove SQL from debug output for a query object.

    Having the SQL as part of the debug output can easily cause error pages
    to be corrupted if a query is an argument to any function in a stack
    trace. Given how the new ORM works, this will happen very frequently.

commit 9f18e5451b8e5950d34f41b6ef2fa1bfd12543a2
Author: mark_story <mark@mark-story.com>
Date:   Thu Aug 21 00:02:22 2014 +0200

    Fix bake templates so they use current i18n markers.

    Fixes #4321

commit e02e4f3e9a259fd36801ffd319fc907941f60cbf
Merge: d459aa7 04d5fdd
Author: mark_story <mark@mark-story.com>
Date:   Wed Aug 20 21:43:40 2014 +0200

    Merge remote-tracking branch 'origin/3.0' into 3.0

commit d459aa711e79840d6fd6c7a77eb0880786eee355
Author: mark_story <mark@mark-story.com>
Date:   Wed Aug 20 21:36:25 2014 +0200

    Fix up patch not being supported by edit in baked controllers.

    Fixes #4284

commit 04d5fdd7b6680f611327960ae23ca0ed10e0c75a
Merge: c77b351 5ae00e9
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Wed Aug 20 21:34:01 2014 +0200

    Merge pull request #4297 from cakephp/null-cache

    Add a null caching engine.

commit c77b3517cf8a9ff2ccec73c541e09e91be0b6b00
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Wed Aug 20 13:06:26 2014 +0200

    BelongsTo associations are safe to bake even for composite keys

    Fixes #4318

commit 16e6dc85e57978cfa771f32eec9fac5b2eb6f159
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Wed Aug 20 12:05:09 2014 +0200

    Temporary hack for #4313

    Also deprecating ControllerTestCase, it will be replaced by another
    more robust solution that will have a bigger emphasis in integration
    testing.

commit 9af768bbb9be6a611757c342a8ac65cf23f7713d
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Wed Aug 20 11:26:05 2014 +0200

    Avoiding a call to session_regenerate_id() when there is no id

    Fixes #4312

commit d047509b365606d7f297f9cdb1ffcc3f4d119241
Author: ADmad <admad.coder@gmail.com>
Date:   Wed Aug 20 12:54:25 2014 +0530

    Add some white space to error logs for better readability.

commit 2d94b3d137a496a88540fe5d09e7ad4caad575d5
Author: ADmad <admad.coder@gmail.com>
Date:   Wed Aug 20 09:28:29 2014 +0530

    Update docblock.

commit 4e4477b8403aefdd9c395b293f3d1afe32e6bb52
Merge: 9d53a1e edc6490
Author: Mark Story <mark@mark-story.com>
Date:   Wed Aug 20 00:38:05 2014 +0200

    Merge pull request #4290 from ravage84/plugin-task-folders

    Updated plugin baking task folder list

commit c6a735b8f4494ce10d38348d77a13ba51d9a7813
Author: mark_story <mark@mark-story.com>
Date:   Wed Aug 20 00:27:14 2014 +0200

    Allow string extensions to be provided to RouteBuilder::extensions()

    This makes the method easier to use when there is only one extension and
    mirrors Router::parseExtensions.

    Refs cakephp/docs#1610

commit 0400a630046430d43c60c346e1661618d3a00574
Author: mark_story <mark@mark-story.com>
Date:   Wed Aug 20 00:25:01 2014 +0200

    Forward port fixes for #4294 from 1.3 to 2.x

    CakeTime was broken in the same way as TimeHelper was in 1.x. Getting
    1969 on invalid input can be very confusing and un-helpful.

    Refs #4294

commit 94cf08fd0872a810e36d1bf8e6ca2c195fc3824a
Merge: 36769ed 8a4fdc4
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Tue Aug 19 23:39:58 2014 +0200

    Merge pull request #4305 from cakephp/3.0-unset-property

    Mark fields as not dirty when they are unset.

commit 36769ed2127abf2fe1182e1f61493618d92ddf16
Merge: d1ebb2a 7f4aa7c
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Tue Aug 19 23:39:42 2014 +0200

    Merge pull request #4299 from cakephp/fixture-reflect-engine

    3.0 Reflect options in schema reflection

commit 07937d5a5f1d52b7bd99c34e037c7305956bd06f
Author: euromark <euromark@web.de>
Date:   Tue Aug 19 13:49:34 2014 +0200

    Correct typo.

commit 8a4fdc41d6cddfd49114552ab4b178b700127338
Author: mark_story <mark@mark-story.com>
Date:   Tue Aug 19 11:22:42 2014 +0200

    Fix failing tests.

    Unset properties are no longer dirty.

commit 7f4aa7c314438dff827717fbd3de0f912798f0af
Author: mark_story <mark@mark-story.com>
Date:   Tue Aug 19 11:03:17 2014 +0200

    Fix typo.

commit d1ebb2abd9e31065d23fd78f792f41fb4f70608a
Merge: 010c122 1a962df
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Tue Aug 19 09:48:06 2014 +0200

    Merge pull request #4301 from dereuromark/3.0-shell

    Add Shell::param()

commit 63e6d380bfa6221bd27968e98f907da9fec38b60
Author: mark_story <mark@mark-story.com>
Date:   Tue Aug 19 09:28:49 2014 +0200

    Mark fields as not dirty when they are unset.

    Leaving unset fields as dirty makes entity create null values when
    persisted.

    Refs #4288

commit 010c122e2d1fe44adf420bf85444e8875012d25f
Merge: 07d979d e10a52f
Author: ADmad <admad.coder@gmail.com>
Date:   Tue Aug 19 10:24:04 2014 +0530

    Merge pull request #4300 from cakephp/3.0-fix-query-json

    3.0 fix query json

commit e10a52f9fdf0acbc9e92ab1d5f8ad2e9b6fe7d83
Author: ADmad <admad.coder@gmail.com>
Date:   Tue Aug 19 10:19:17 2014 +0530

    Improve docblock formatting.

commit 1a962df914bd6f82fd700377a6e2092ba11b98c5
Author: euromark <euromark@web.de>
Date:   Tue Aug 19 03:08:47 2014 +0200

    fix test

commit fc9b288933dc89fef5be4a4361cbc30ebd0f1ae4
Author: euromark <euromark@web.de>
Date:   Tue Aug 19 02:57:39 2014 +0200

    Add Shell::param()

commit 5ae00e954c6989ec2c3be9e4dc5770407679b1b3
Author: mark_story <mark@mark-story.com>
Date:   Tue Aug 19 01:05:04 2014 +0200

    Fix typo

commit 646fe4ec4ba4e45e0d1ad1acb15be18df3663642
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Tue Aug 19 00:28:54 2014 +0200

    Fixed typos

commit 07d979d7f88b0c5b298bc602046cbd95193c7b54
Merge: d35db70 0c1a7fe
Author: Mark Story <mark@mark-story.com>
Date:   Tue Aug 19 00:26:57 2014 +0200

    Merge pull request #4292 from antograssiot/3.0-error-template

    3.0 error template

commit e9456c2d477dbab45c97b4381a37f7daceab0f2e
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Tue Aug 19 00:16:33 2014 +0200

    Adding tests for serializing a query to json

commit 44ef9db74c6059b12653c601c6a9824630ef536a
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Mon Aug 18 23:55:32 2014 +0200

    Making Query json serializable

commit d35db701d3cbde83ba05b0fc9f0b1abb3809aa39
Merge: edd85f5 32775a6
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Tue Aug 19 00:04:21 2014 +0200

    Merge pull request #4289 from cakephp/3.0-composer

    Move tests path under "autoload-dev".

commit 0c1a7fe94f846c4bbc23dcf92df2f6ef5378331e
Author: antograssiot <antograssiot@free.fr>
Date:   Mon Aug 18 19:17:05 2014 +0200

    add MissingDatasourceException test

commit edc6490f112031e862fda57f2169ba68afaf3a73
Author: Marc Würth <ravage@bluewin.ch>
Date:   Mon Aug 18 18:55:17 2014 +0200

    Removed Vendor folder from plugin baking task, updated test

commit 6e1b8f3ce837a4e4ade75b1ec3e5b7aea6fa9a0e
Author: Marc Würth <ravage@bluewin.ch>
Date:   Mon Aug 18 18:54:48 2014 +0200

    Added missing folders to plugin baking task, updated test

commit 54b8c1d60e738063b3284c1c3a1ecd5ac25e96ee
Author: antograssiot <antograssiot@free.fr>
Date:   Mon Aug 18 18:31:18 2014 +0200

    remove missing_database.ctp

    MissingDatabaseException is not part of the core anymore

commit 32775a694f617413ec1a59cbeed5fafb2d0ea8b6
Author: ADmad <admad.coder@gmail.com>
Date:   Mon Aug 18 19:38:27 2014 +0530

    Move tests path under "autoload-dev".

commit 05d8a193c006eec84b81d16e158fa476d0a0501f
Author: mark_story <mark@mark-story.com>
Date:   Sun Aug 17 23:41:34 2014 +0200

    Add a null caching engine.

    Having a NullEngine makes a bunch of internal operations simpler as we
    don't have to check whether or not the engine() method returned an
    instance or not. It also makes it easy to use a null adapter in testing
    without having to generate mocks.

commit 2fc00df1d945ff9b8b5aa67a065b1a9d502fce03
Author: mark_story <mark@mark-story.com>
Date:   Sun Aug 17 23:20:21 2014 +0200

    Make schema internal methods consistent.

    Make methods consistent so that method names can be generated allowing
    code to be simpler and more well factored.

    Refs #4263

commit 7f2d35676cdf2f639de554e2cdb3ceb7fdd7b3f3
Author: mark_story <mark@mark-story.com>
Date:   Sun Aug 17 22:42:47 2014 +0200

    Add collation to reflected schema values.

    Refs #4263

commit 623fe8bb38f5723d64df0faf86d70444ef521822
Author: mark_story <mark@mark-story.com>
Date:   Sun Aug 17 22:38:27 2014 +0200

    Add hook to describe table options when reflecting a table.

    This will let the schema subsystem get engine information from MySQL
    when reflecting tables. Other table types do not use options so the base
    class methods are noops instead of abstract methods.

    Refs #4263

commit ecadcccf8884413664a63f9263c95e7310ea2e69
Author: mark_story <mark@mark-story.com>
Date:   Sun Aug 17 22:21:55 2014 +0200

    Close cursors that are done.

commit edd85f5e323957c67065e9c34cd35f052cf26557
Merge: 59efd4f d3f43ab
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Sun Aug 17 21:22:21 2014 +0200

    Merge pull request #4282 from ADmad/3.0-sesion-cookie-path

    Make session cookie path setting a bit DRYer.

commit 59efd4f1a57cff6edfed2e8fe69554d4bfd01b7f
Merge: c5f3cbd 22c374c
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Sun Aug 17 21:20:12 2014 +0200

    Merge pull request #4272 from cakephp/issue-4260

    Fix exists() being called on every save() operation.

commit c5f3cbd5e8d31222d35c544d08cace89def40ffa
Merge: a2f1456 c052437
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Sun Aug 17 21:19:11 2014 +0200

    Merge pull request #4251 from cakephp/3.0-fix-comparison

    Added support to Comparison expression for using Expressions as the field

commit d3f43abd887eeea09d0261d330e6fe4c2dc9f68e
Author: ADmad <admad.coder@gmail.com>
Date:   Sun Aug 17 19:13:00 2014 +0530

    Make session cookie path setting a bit DRYer.

commit a2f1456f494804f76b1816e3ae666ef7bda008ad
Merge: b6b983b 47f88fa
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Sun Aug 17 09:40:10 2014 +0200

    Merge pull request #4279 from cakephp/no-app-objects

    Remove App::objects()

commit b6b983b9b38c03942283445a9a4a8a9e10ec2038
Merge: f59fc02 2936f6d
Author: ADmad <admad.coder@gmail.com>
Date:   Sun Aug 17 11:04:59 2014 +0530

    Merge pull request #4275 from ADmad/3.0-cookie-path

    Set default cookie path to app's base path instead of "/".

commit 2936f6d1a4723b3ed98ac1090d0e19ca8efe836b
Author: ADmad <admad.coder@gmail.com>
Date:   Sun Aug 17 10:52:32 2014 +0530

    Update docblock.

commit df3148a93673a66512b6994abcd6fb6165254eb0
Author: ADmad <admad.coder@gmail.com>
Date:   Sun Aug 17 10:33:52 2014 +0530

    Avoid unnecessary Hash::merge() call.

commit 47f88fa141f2c6af979967b8bb0dab4c1bf38db6
Author: mark_story <mark@mark-story.com>
Date:   Sun Aug 17 01:02:24 2014 +0200

    Remove App::objects().

    Since it has no callers and frequently does the wrong thing, it no
    longer needs to be around.

    Refs #4256

commit a02794a0e061a104cab22eb634c95b6b162a9296
Author: mark_story <mark@mark-story.com>
Date:   Sun Aug 17 00:48:11 2014 +0200

    Remove App::objects() call.

    Using bake templates now requires you to load a plugin. I don't see this
    as a huge obstacle if you want to use templates from a plugin. This also
    fixes issues where plugins not using `src/` would not work with
    TemplateTask.

commit 3c00ea47991ce46b0af955869f467031a5d76725
Author: mark_story <mark@mark-story.com>
Date:   Sun Aug 17 00:47:03 2014 +0200

    Don't use pass by ref variables.

    I don't much care for pass by ref when there are simpler ways to write
    the required code.

commit 65cacbc8f6e9b8a49de49f3c7fd607dc478ecec4
Author: mark_story <mark@mark-story.com>
Date:   Sun Aug 17 00:43:02 2014 +0200

    Don't use App::objects() in command shell tools.

commit 3f10889ed86028fdc8446ab2cdc9f08d2d322bab
Author: mark_story <mark@mark-story.com>
Date:   Sun Aug 17 00:32:36 2014 +0200

    Remove reliance on App::objects() from Plugin::loadAll()

    App::objects() is going away as it has a number of annoying flaws that
    are not easily fixable. It cannot:

    * Find prefix controllers.
    * Find vendor namespaced plugins.
    * Find entity classes etc.

    In light of all this, it would be better if each of the callers
    implemented the directory scanning logic they needed and App::objects()
    was not a source of lies.

    Refs #4256

commit c052437ae52db0c1e2293ff6416f2a2ccc47e921
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Sat Aug 16 22:36:06 2014 +0200

    Hopefully fixed SQL server this time

commit 4b9ee0d01c4eeb288fa59ae32cd4e317e779cae0
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Sat Aug 16 22:03:59 2014 +0200

    Figuring out what SQL is offending SQL Server

commit 688082ddf17f83b4c76a3f80170abac9bc31e053
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Sat Aug 16 21:14:51 2014 +0200

    trying to trigger a SQL server build error

commit bc68b864b87c5e949556a68f65abf0ce6b59eb5c
Author: ADmad <admad.coder@gmail.com>
Date:   Sun Aug 17 00:43:13 2014 +0530

    Rename "cookie_path" to "cookiePath" for consistency.

commit 266818a459fd0d95728cbe69f5ba5d547c8d511c
Author: ADmad <admad.coder@gmail.com>
Date:   Sat Aug 16 23:34:58 2014 +0530

    Update docblock.

commit be8db3d5b80d1bf85165761c5cef45bd0a96e745
Author: ADmad <admad.coder@gmail.com>
Date:   Sat Aug 16 23:22:06 2014 +0530

    Fix docblock

commit f6590bdb41437c7071775980fbbe6a28319a2b3f
Author: ADmad <admad.coder@gmail.com>
Date:   Sat Aug 16 20:00:13 2014 +0530

    Add "cookie_path" as shorthand for php.ini's "session.cookie_path" config.

commit 22c374c821c8b9ebaed6220c20a2d7845319bc73
Author: mark_story <mark@mark-story.com>
Date:   Sat Aug 16 00:31:59 2014 +0200

    Use EntityTrait->has() where possible.

    The new has() signature supports higher level code in Table operations
    and lets use not use array_filter() in various different ways.

commit 3f0bd20f867b4872e5c7a50076d588a98541f633
Author: mark_story <mark@mark-story.com>
Date:   Sat Aug 16 00:23:10 2014 +0200

    Expand has() so we can check multiple properties at once.

commit c069653233e0f65236e9cca880fc39b48f8be7db
Author: mark_story <mark@mark-story.com>
Date:   Sat Aug 16 00:17:36 2014 +0200

    More correctly fix issue where new entities would trigger an exists() query.

    We need to allow 0 as a primary key, but not check for existing records
    if there are no primary key columns.

    Additionally, fix up tests that were checking that exists() was called
    and now it is not.

commit 67d7db0cfed420907a69ec44a8e9785153ea3497
Author: mark_story <mark@mark-story.com>
Date:   Sat Aug 16 00:05:04 2014 +0200

    Tidy up docblock.

commit f59fc020d3ea2ff6d310d8e0eb4d28df66b52577
Merge: 15a8e71 14db1a5
Author: ADmad <admad.coder@gmail.com>
Date:   Sat Aug 16 01:53:57 2014 +0530

    Merge pull request #4276 from majna/3.0-missing-behavior

    Fix missing behavior class name

commit 14db1a5e0a1180aa1fb8ca2a2e64b2dbe5979ed6
Author: Majna <majnaggz@gmail.com>
Date:   Fri Aug 15 21:19:01 2014 +0200

    Fix missing behavior class name

commit 15a8e712e133a0ca6fc11d511f7b492640d9b7af
Author: ADmad <admad.coder@gmail.com>
Date:   Fri Aug 15 21:17:04 2014 +0530

    Use Plugin::classPath() instead of hardcoded "src" in path.

commit ec84c26e4654dc8329a55b823fa2038539e80662
Author: ADmad <admad.coder@gmail.com>
Date:   Fri Aug 15 19:34:10 2014 +0530

    Set default cookie path to app's base path instead of "/".

    This allows running multiple apps in subfolders under document root, without
    interfering with each other or potentially other non-cake apps on same domain.

commit df9c6ed80e537e89c8e29981ae7df7a34e914f5c
Author: ADmad <admad.coder@gmail.com>
Date:   Fri Aug 15 12:56:06 2014 +0530

    Moved logo below badges.

commit 89544d6de05aff1005a26297eafc5321b1353e23
Merge: 60adfc1 9d53a1e
Author: ADmad <admad.coder@gmail.com>
Date:   Fri Aug 15 12:47:20 2014 +0530

    Merge branch '2.6' into 3.0

    Conflicts:
    	.travis.yml
    	README.md
    	app/webroot/index.php
    	app/webroot/test.php
    	lib/Cake/Console/Command/SchemaShell.php
    	lib/Cake/Console/Command/Task/ControllerTask.php
    	lib/Cake/Console/Templates/skel/webroot/index.php
    	lib/Cake/Console/Templates/skel/webroot/test.php
    	lib/Cake/Controller/Component/CookieComponent.php
    	lib/Cake/Log/CakeLog.php
    	lib/Cake/Model/CakeSchema.php
    	lib/Cake/Model/Datasource/CakeSession.php
    	lib/Cake/Model/Datasource/DboSource.php
    	lib/Cake/Model/Model.php
    	lib/Cake/Test/Case/Model/CakeSchemaTest.php
    	lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
    	lib/Cake/Test/Case/Model/ModelWriteTest.php
    	lib/Cake/View/Helper/CacheHelper.php
    	lib/Cake/View/Helper/TimeHelper.php
    	lib/Cake/basics.php
    	src/Network/Response.php
    	src/Validation/Validation.php

commit 9d53a1e9ce4a7e057638e5321cc22c55e3d58bfc
Merge: cb45821 b5688f0
Author: ADmad <admad.coder@gmail.com>
Date:   Fri Aug 15 12:37:13 2014 +0530

    Merge branch 'master' into 2.6

commit 6e9bb5a43e422feadca57a474f941413a656c0c2
Author: mark_story <mark@mark-story.com>
Date:   Fri Aug 15 08:48:10 2014 +0200

    Fix exists() being called on every save() operation.

    If an entity isNew and contains no primary key data we should not call
    exists() as there is no way for it to exist yet. Exists should continue
    to be called when the entity has a primary key value and is marked as
    new though as it may or may not exist in the database and we need to
    know.

    Fixes #4260

commit 60adfc133ca9a370ced390e9cbd5ce6521e2dcb2
Merge: 5745e00 02fae33
Author: Mark Story <mark@mark-story.com>
Date:   Fri Aug 15 08:28:39 2014 +0200

    Merge pull request #4268 from antograssiot/3.0

    Add test for missing datasource config template

commit 02fae338c030d33a5e5e287aff6e277b8c84453e
Author: antograssiot <antograssiot@free.fr>
Date:   Thu Aug 14 22:58:21 2014 +0200

    fixing test

commit 5745e00b7107baee0ff194a699ff11467b64a4c8
Merge: 928adf7 7930a43
Author: Mark Story <mark@mark-story.com>
Date:   Thu Aug 14 22:48:29 2014 +0200

    Merge pull request #4264 from cakephp/3.0-fix-reciprocal-btm

    Fixes #4253

commit cbde00614f8e8738f8d1fd8dbbe66344040ee447
Author: Anthony GRASSIOT <antograssiot@free.fr>
Date:   Thu Aug 14 21:21:25 2014 +0200

    fix Database driver message template

commit 5c41beba72a566da2e2029f5dd7ec51e2eb330c5
Author: Anthony GRASSIOT <antograssiot@free.fr>
Date:   Thu Aug 14 21:01:39 2014 +0200

    add test for missing datasource template to be rendered

commit 928adf768452c7f941b64806d117b359ccde18d7
Merge: ee14edf fd14ac0
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Thu Aug 14 19:32:00 2014 +0200

    Merge pull request #4234 from cakephp/3.0-url-helper

    3.0 url helper

commit ee14edf7f2beabc6abff6c0375895419ea62efc1
Merge: 352bbba 98ca880
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Thu Aug 14 19:29:44 2014 +0200

    Merge pull request #4262 from cakephp/3.0-nullable-types

    3.0 Make Integer, Float and Date/Time types handle '' better

commit 7930a43838e7f563e383fd29c44214e0e243711b
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Thu Aug 14 19:27:50 2014 +0200

    Fixed typo

commit 5927ea0f3f985ea025a8e755e05d3722b7235ee4
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Thu Aug 14 16:12:31 2014 +0200

    Fixes #4253

commit 98ca880a050772bd29ac0649409fdae8219c2fec
Author: mark_story <mark@mark-story.com>
Date:   Thu Aug 14 03:36:03 2014 -0400

    Split out Integer and Float type converters.

    Having separate classes makes it much easier to handle the '' => null
    conversions. It also makes these types 'faster' as the concrete type has
    fewer/simpler code than the base Type class.

    This solves integer casting issues that came up in #4058

commit 352bbbad7b27acb589fc40be140e85c3e3113104
Merge: b95a617 2a0f351
Author: Mark Story <mark@mark-story.com>
Date:   Thu Aug 14 03:23:53 2014 -0400

    Merge pull request #4258 from cakephp/3.0-plugin

    3.0 plugin bake

commit 2a0f3511bfcda9a90234034de2a679933d3fba72
Author: ADmad <admad.coder@gmail.com>
Date:   Thu Aug 14 11:50:10 2014 +0530

    Remove namespace from baked routes file.

commit 808d499fca10d3bbba72c71719a6045c6fc14452
Author: ADmad <admad.coder@gmail.com>
Date:   Thu Aug 14 11:48:56 2014 +0530

    Added ConventionsTrait::_pluginNamespace().

    Fix namespace in generated files for vendor namespaced plugins.

commit c70db96a4260cd7b20711e15431c2fd885222ddb
Author: mark_story <mark@mark-story.com>
Date:   Thu Aug 14 01:17:09 2014 -0400

    Make Date/DateTime/Time types convert '' to null.

    Postgres gets really unhappy when you put '' into a timestamp or time
    column type. Instead we can marshall '' into null for these types which
    generally causes fewer issues.

    Refs #4059

commit b95a61749c3158d98b1146934c402cf4e2bd7934
Merge: 13fc7c3 821a7df
Author: ADmad <admad.coder@gmail.com>
Date:   Thu Aug 14 08:39:48 2014 +0530

    Merge pull request #4255 from cakephp/3.0-collection-method

    Adding a shortcut collection method

commit 821a7df27cf93b004a52e35c7e17621c7d785a88
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Thu Aug 14 00:47:17 2014 +0200

    Improving doc block

commit 13fc7c3e5227e2f401eca6226e1fcb2a80ff6160
Merge: a8bb23f 205ee0a
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Thu Aug 14 00:45:54 2014 +0200

    Merge pull request #4257 from ADmad/3.0-plugin

    3.0 plugin

commit 205ee0a255ad6eb3778bcf43e4fd7c4121a4613f
Author: ADmad <admad.coder@gmail.com>
Date:   Thu Aug 14 02:16:26 2014 +0530

    Avoid prefixing translation files with vendor name for vendor namespaced plugins.

commit 1280fe0fb25bac841423337a3e9e9b047e6cb35b
Author: ADmad <admad.coder@gmail.com>
Date:   Thu Aug 14 01:54:58 2014 +0530

    Revert backslash to forward slash in vendor namespaced plugin names.

    It caused problems like having to escape the backslash on command line.

commit a8bb23fc0fa4d0672908415127fe13c163ca3d54
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Wed Aug 13 22:09:28 2014 +0200

    Trying to speed up a bit appveyor builds

commit a69f37170497fc5eef02dd83e51eb570093ea048
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Wed Aug 13 22:01:38 2014 +0200

    Altering test in hope of making SQL server happy

commit 0651182c33f98e87a5b64a906c93d6df2709634f
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Wed Aug 13 22:01:28 2014 +0200

    Revert "Fixing tests in SQL Server"

    This reverts commit 5c1969910bede542c0f94b1e4b98f26c4f6a5eb2.

commit 2dc378289d22aa6ebbf87681707e5d6e28fcddcf
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Wed Aug 13 21:56:28 2014 +0200

    Adding a shortcut collection method

commit 5c1969910bede542c0f94b1e4b98f26c4f6a5eb2
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Wed Aug 13 21:32:43 2014 +0200

    Fixing tests in SQL Server

commit 0cf9921798d823fa87b61bb93f908c57a132a53f
Author: Jose Lorenzo Rodriguez <jose.zap@gmail.com>
Date:   Wed Aug 13 13:09:04 2014 +0200

    Added support to Comparison expression for using Expressions as the field

commit fd14ac04de889ad364325f129e059cd54245fab5
Author: ADmad <admad.coder@gmail.com>
Date:   Wed Aug 13 12:50:07 2014 +0530

    Fix test case class name.

commit b5688f069cca56a3c9ebd8398266e2aad0f8a2fa
Merge: c5d1bcf fc852b9
Author: Mark Story <mark@mark-story.com>
Date:   Tue Aug 12 14:42:39 2014 -0400

    Merge pull request #4244 from beporter/add-contributing-pointer-to-readme

    Add "contributing" pointers to GitHub readme

commit c5d1bcfe94b4e171d42f69f0750e548c806f0358
Merge: f1d0173 5c69ac5
Author: ADmad <admad.coder@gmail.com>
Date:   Tue Aug 12 23:28:59 2014 +0530

    Merge pull request #4245 from beporter/cakeschema-style-guide-updates

    Improve docblock formatting.

commit 5c69ac557850fa1090de14ea592312f1e96df563
Author: Brian Porter <beporter@users.sourceforge.net>
Date:   Tue Aug 12 12:28:34 2014 -0500

    All CakeSchema doc blocks conform to coding standards.

    As laid out here: http://book.cakephp.org/2.0/en/contributing/cakephp-coding-conventions.html#typehinting

commit 98788a0e54f68f35976c7df288d92f9ee1d7fdf5
Author: ADmad <admad.coder@gmail.com>
Date:   Tue Aug 12 22:51:12 2014 +0530

    Rename UrlHelper::url() to UrlHelper::build().

commit fc852b9316cd7111958f31e2fd935c058137f8da
Author: Brian Porter <beporter@users.sourceforge.net>
Date:   Tue Aug 12 12:20:10 2014 -0500

    Style tweak.

commit 1285a0515223ac726bf45599f10395e02e6cca98
Author: Brian Porter <beporter@users.sourceforge.net>
Date:   Tue Aug 12 12:16:45 2014 -0500

    Added additional 3.0 doc link.

commit 813357f449afaf92c81a778287ad8b01d499f17a
Author: Brian Porter <beporter@users.sourceforge.net>
Date:   Tue Aug 12 12:11:30 2014 -0500

    Adds a link to the README for people like me that don't spot the CONTRIBUTING.md file in root folder.

commit f1d01732a543abf6374a831b8805503388232602
Merge: 4af529e 4a0f42e
Author: Mark Story <mark@mark-story.com>
Date:   Tue Aug 12 12:53:42 2014 -0400

    Merge pull request #4230 from beporter/bug/schemashell-name-file-params-fix

    SchemaShell --name and --file params priority fix.

    Fixes #4174

commit 4a0f42e179d4a13ad1e3529c9a437b0d83b01d44
Author: Brian Porter <beporter@users.sourceforge.net>
Date:   Tue Aug 12 10:48:12 2014 -0500

    Doc block capitalization corrections as requested.

commit 4af529e764d4b8e766a27cc9537838b18b47ce77
Merge: ffefa64 8bec213
Author: Mark Story <mark@mark-story.com>
Date:   Mon Aug 11 15:56:37 2014 -0400

    Merge pull request #4231 from ceeram/travis

    Slim down travis build matrix

commit 62bd8232afb6a1e39a359c55a1a5ca2b19492058
Author: ADmad <admad.coder@gmail.com>
Date:   Tue Aug 12 00:39:25 2014 +0530

    Doh, actaully add UrlHelper to repo.

commit 6cd3dcafa2c118a8d6f28b8045765c9a6fa3d1b6
Author: ADmad <admad.coder@gmail.com>
Date:   Tue Aug 12 00:22:34 2014 +0530

    Update helpers to use UrlHelper.

commit 6a3fd97d32d4760a980f7e4a4cf21b18107ec230
Author: ADmad <admad.coder@gmail.com>
Date:   Mon Aug 11 23:44:55 2014 +0530

    Move all url generation methods from Helper to UrlHelper.

commit 8bec213b5a93ec626a0963e798484a01302b431d
Author: ceeram <c33ram@gmail.com>
Date:   Mon Aug 11 19:45:43 2014 +0200

    Update .travis.yml

commit 7d8d2f2f18628e8b03bc43cf275b1f18e4bf6462
Author: Brian Porter <beporter@users.sourceforge.net>
Date:   Mon Aug 11 11:51:09 2014 -0500

    Code sniff fix.

commit 3334bfa4555b81377438275eb4bd38003c4dbe54
Author: Ceeram <c33ram@gmail.com>
Date:   Mon Aug 11 18:04:35 2014 +0200

    Slim down travis build matrix

commit 9b9600fe18c1acd2caf4d853d88f2e4ef7bc25f4
Author: Brian Porter <beporter@users.sourceforge.net>
Date:   Mon Aug 11 10:40:57 2014 -0500

    CakeSchema naming fallback.

    Abstracts the `require_once` of the schema file so it can be done twice. The added second call is a fallback for the previous APP_DIR-based naming to provide backwards compatibility.

    Removes now-obsolete CakeSchema tests that involved `Configure::read('App.dir')`. The CakeSchema::name is now always static (and predictable) in the default case.

commit 543e520ccb7f5ff3009f0da58e38f4467c8137b5
Author: Brian Porter <beporter@users.sourceforge.net>
Date:   Mon Aug 11 10:09:45 2014 -0500

    Corrects logic to only apply default filename in **all** cases where none provided.

commit 6358208e322732a0d1038fd68ba91b81ec96f950
Author: Brian Porter <beporter@users.sourceforge.net>
Date:   Mon Aug 11 09:23:56 2014 -0500

    Figures it'd be a missing paren.

commit be9be48c46aa4ad588baa495823fda1514ba2512
Author: Brian Porter <beporter@users.sourceforge.net>
Date:   Mon Aug 11 09:12:16 2014 -0500

    More predictable default for CakeShema class naming.

    Instead of using the `APP_DIR` constant, which may change between developer installations of a project and cause issues loading Schemas generated elsewhere, use a fixed string, 'App'.

    This is related to CakeDC/migrations#184 and should fully resolve #4174.

commit f93029b29f01adc467e2007e8665913356624a56
Author: Brian Porter <beporter@users.sourceforge.net>
Date:   Mon Aug 11 09:08:59 2014 -0500

    SchemaShell always uses --file param when present.

    Addresses **part** of the problem described in #4174.

    Corrects SchemaShell's startup logic so that when a `--file` param is provided by the user, it is always used even in the case that it matches the default file name (schema.php). This solves a problem when a user wishes to provide a classname using `--name`, but still wants to use the default filename.

commit ffefa6425fb89d80fe940ea70e61f4ec244d1531
Merge: d114fa1 120bd37
Author: Mark Story <mark@mark-story.com>
Date:   Sun Aug 10 22:25:12 2014 -0400

    Merge pull request #4225 from ravage84/php7-uniform-variable-syntax

    Be forward compatible to PHP 7's "Uniform Variable Syntax"

commit 120bd37ffaf9387a86295589fe745afe3a3a84d1
Author: Marc Würth <ravage@bluewin.ch>
Date:   Mon Aug 11 01:33:25 2014 +0200

    Be forward compatible to PHP 7's "Uniform Variable Syntax"

    https://wiki.php.net/rfc/uniform_variable_syntax

commit cb45821c4333591d987e57dc5cb36688e065c533
Author: mark_story <mark@mark-story.com>
Date:   Fri Aug 8 23:29:29 2014 -0400

    Fix reversed arguments in error message.

commit 9c3089796f5d27fe50863b8885f62a4a748b80c0
Merge: 9295791 d114fa1
Author: mark_story <mark@mark-story.com>
Date:   Fri Aug 8 23:28:06 2014 -0400

    Merge branch 'master' into 2.6

    Conflicts:
    	lib/Cake/Model/Model.php

commit d114fa143197886527bf1c8f2df5b49eb15242d1
Author: mark_story <mark@mark-story.com>
Date:   Fri Aug 8 10:02:09 2014 -0400

    Update join building to not error out on empty conditions.

    When conditions are empty we can assume one of two things:

    * The person made a mistake.
    * The person is doing the join conditions in the where clause.

    In both cases we should attempt to generate proper SQL.

    Fixes #4189

commit 92957913d93404d8554345d4e41cb3c723a0a842
Merge: c3ded4e fbeb8fe
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Thu Aug 7 08:54:11 2014 +0200

    Merge pull request #4023 from cvo-technologies/2.6-basics-context

    Add the other translation shortcuts for context support

commit 7c8770d577cff63ea26a56e18df34dd965746cfd
Merge: 53447fe 49bdde8
Author: Mark Story <mark@mark-story.com>
Date:   Wed Aug 6 20:23:05 2014 -0400

    Merge pull request #4183 from ravage84/patch-1

    Added links to book

commit 49bdde88d20adb331034f0a293e41f0d7ae6bd22
Author: Marc Würth <ravage@bluewin.ch>
Date:   Thu Aug 7 01:56:53 2014 +0200

    Added links to book

commit 53447fe2fbc8185691875a189ecd6d6be92e706c
Merge: dda4933 5f5218f
Author: Mark Story <mark@mark-story.com>
Date:   Wed Aug 6 17:38:59 2014 -0400

    Merge pull request #4182 from dereuromark/master-cookie

    Fix cookie reading.

commit 5f5218f3b20cdb43a0680825ffc760e2965b4854
Author: euromark <euromark@web.de>
Date:   Wed Aug 6 22:53:54 2014 +0200

    Fix cookie reading.

commit dda4933ed04ba1eacd9e278c7927bee36f9c787b
Merge: 2471c64 60603cd
Author: Mark Story <mark@mark-story.com>
Date:   Wed Aug 6 13:06:37 2014 -0400

    Merge pull request #4180 from dereuromark/master-readme

    Make readme more shiney and informative.

commit 2471c64aaeaf9f44609a39532ec8a67511411e4f
Merge: 64e74cb 864f5e0
Author: Mark S. <euromark@web.de>
Date:   Wed Aug 6 18:25:55 2014 +0200

    Merge pull request #4158 from dereuromark/master-cakesession-hotfix

    Fix notice in CakeSession.

commit 60603cd9be65d5addb565a1e611986a08ac0a8cf
Author: euromark <euromark@web.de>
Date:   Wed Aug 6 17:53:31 2014 +0200

    Make readme more shiney and informative.

commit c3ded4e2904825de68f4b0c58278918421943cd7
Merge: b608bdf e714341
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Wed Aug 6 10:49:07 2014 +0200

    Merge pull request #4167 from dereuromark/2.6-composer

    Auto-detect composer installed CakePHP folder.

commit 64e74cbaac11f8f0a1b76c826711328202dc2405
Merge: 221fc86 1fe943d
Author: José Lorenzo Rodríguez <jose.zap@gmail.com>
Date:   Wed Aug 6 10:48:45 2014 +0200

    Merge pull request #4175 from chinpei215/master-issue2268-fix

    Fix afterFind() called twice with belongsTo and hasOne relationships

commit 221fc862aa781078cc112e6d620375a3e248610a
Merge: fa2cba6 cb376bf
Author: Mark Story <mark@mark-story.com>
Date:   Tue Aug 5 20:05:15 2014 -0400

    Merge pull request #4140 from chinpei215/master-issue2849-fix

    Fix transactions do not get rollbacked in saveAssociated/saveMany.

    Fixes #2849

commit 1fe943d6f1814cd3756d71c035d2b69fc36ce066
Author: chinpei215 <chinpei215@hotmail.com>
Date:   Wed Aug 6 06:49:04 2014 +0900

    Fix afterFind() called twice with belongsTo and hasOne relationships

    Refs #2268

commit fa2cba6dff7177e631a7a3cdbf11658934d27c14
Merge: 214d278 4957418
Author: ADmad <admad.coder@gmail.com>
Date:   Tue Aug 5 18:26:12 2014 +0530

    Merge pull request #4169 from thinkingmedia/patch-1

    Added missing return statement.

commit 4957418a4bad3d2cba1b157c1dbe2959f9d39034
Author: Mathew Foscarini <mathew@thinkingmedia.ca>
Date:   Tue Aug 5 08:39:19 2014 -0400

    Added missing return statement.

    PhpStorm is flagging this function as missing a return statement. Using a return statement (instead of the default) makes the intent of the source code clearer.

commit e714341ce344c128456996203fb78df0c5c9b7cd
Author: euromark <euromark@web.de>
Date:   Tue Aug 5 03:53:40 2014 +0200

    Auto-detect composer installed CakePHP folder.

commit b608bdfadb13ea9888da46a5b4fbad75406a7e76
Merge: 713f430 816e64b
Author: Mark Story <mark@mark-story.com>
Date:   Mon Aug 4 19:09:05 2014 -0400

    Merge pull request #4164 from dereuromark/2.6-deprecate-ssn-validation

    Deprecate ssn() validation in favor of plugin Localized.

commit 816e64bec8b56ac2918bf746e5384961fc45c2c5
Author: euromark <euromark@web.de>
Date:   Mon Aug 4 16:46:56 2014 +0200

    Adjust wording.

commit bbcdf2404e1566ca6b8baef7745e7a953dc86e62
Author: euromark <euromark@web.de>
Date:   Mon Aug 4 16:39:43 2014 +0200

    Deprecate ssn() validation in favor of plugin Localized.

commit 214d2781193a27a839d131e2ec5e12af2d890a22
Merge: 4e168ca 9ef7b57
Author: Mark Story <mark@mark-story.com>
Date:   Mon Aug 4 10:06:41 2014 -0400

    Merge pull request #4161 from dereuromark/master-cs-equals

    CS fixes.

commit 9ef7b5713ab08a1983d2682826906c61c1a26819
Author: euromark <euromark@web.de>
Date:   Mon Aug 4 13:53:52 2014 +0200

    CS fixes.

commit 864f5e06f69afe93918ba8d0fe3403a8fc11f549
Author: euromark <euromark@web.de>
Date:   Mon Aug 4 13:32:20 2014 +0200

    Fix notice in CakeSession.

commit 4e168ca004ee8b0a5cdba7271d897c29cd652fc0
Author: mark_story <mark@mark-story.com>
Date:   Sun Aug 3 20:36:31 2014 -0400

    Fix incorrect docs.

commit cb376bf420a7414ef573d4d7c4ff7d23ef0a4514
Author: chinpei215 <chinpei215@hotmail.com>
Date:   Sun Aug 3 22:34:11 2014 +0900

    Add some more transaction tests

    And remove 2 else clauses.

commit 2359e89c782e11af5e7ff8488696e276a3a1e337
Merge: 8e40fcf c193ce7
Author: Mark Story <mark@mark-story.com>
Date:   Sat Aug 2 18:45:48 2014 -0400

    Merge pull request #4150 from ADmad/2.5-cachehelper-exception

    Throw exception instead of logging in debug mode when view cache fails.

commit c193ce708a7920535b4e8aaab7499518e6f9fcde
Author: ADmad <admad.coder@gmail.com>
Date:   Sun Aug 3 03:11:19 2014 +0530

    Throw exception instead of logging in debug mode.

commit 799500ce6d10d46cb7b3804454319ce1cbb47520
Author: chinpei215 <chinpei215@hotmail.com>
Date:   Sat Aug 2 10:12:33 2014 +0900

    Fix transactions do not get rollbacked in saveAssociated/saveMany

    Refs #2849

commit 3d77ce5d34d64beb30815772ddcce3b9803cec1e
Author: chinpei215 <chinpei215@hotmail.com>
Date:   Sat Aug 2 06:41:00 2014 +0900

    Fix serveral tests pass regardless of whether data is valid or not

commit fbeb8fe26b04a4f6eed61726526441b36bcc116f
Author: Marlin Cremers <m.cremers@cvo-technologies.com>
Date:   Sat Jul 19 18:27:44 2014 +0200

    Add the other translation shortcuts for context support
2935dcb
@deizel deizel referenced this pull request in cakephp/docs
Merged

Update global functions #2466

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
This page is out of date. Refresh to see the latest.
Showing with 204 additions and 1 deletion.
  1. +7 −0 lib/Cake/Console/Command/Task/ExtractTask.php
  2. +197 −1 lib/Cake/basics.php
View
7 lib/Cake/Console/Command/Task/ExtractTask.php
@@ -380,6 +380,13 @@ protected function _extractTokens() {
$this->_parse('__dcn', array('domain', 'singular', 'plural', 'count', 'category'));
$this->_parse('__x', array('context', 'singular'));
+ $this->_parse('__xn', array('context', 'singular', 'plural'));
+ $this->_parse('__dx', array('domain', 'context', 'singular'));
+ $this->_parse('__dxc', array('domain', 'context', 'singular', 'category'));
+ $this->_parse('__dxn', array('domain', 'context', 'singular', 'plural'));
+ $this->_parse('__dxcn', array('domain', 'context', 'singular', 'plural', 'count', 'category'));
+ $this->_parse('__xc', array('context', 'singular', 'category'));
+
}
}
View
198 lib/Cake/basics.php
@@ -800,7 +800,203 @@ function __x($context, $singular, $args = null) {
App::uses('I18n', 'I18n');
$translated = I18n::translate($singular, null, null, null, null, null, $context);
$arguments = func_get_args();
- return I18n::insertArgs($translated, array_slice($arguments, 1));
+ return I18n::insertArgs($translated, array_slice($arguments, 2));
+ }
+
+}
+
+if (!function_exists('__xn')) {
+
+/**
+ * Returns correct plural form of message identified by $singular and $plural for count $count.
+ * Some languages have more than one form for plural messages dependent on the count.
+ *
+ * @param string $context Context of the text
+ * @param string $singular Singular text to translate
+ * @param string $plural Plural text
+ * @param integer $count Count
+ * @param mixed $args Array with arguments or multiple arguments in function
+ * @return mixed plural form of translated string
+ * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__n
@ADmad Collaborator
ADmad added a note

Link is incorrect. Could change the fragment to #__xn assuming that section will be added.

@Marlinc
Marlinc added a note

Ah I see, all links seem to be wrong. Should I add the right anchor to all of the links or would it be better if I remove the links entirely.

@lorenzo Owner
lorenzo added a note

@Marlinc just remove the links

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
+ */
+ function __xn($context, $singular, $plural, $count, $args = null) {
+ if (!$singular) {
+ return;
+ }
+
+ App::uses('I18n', 'I18n');
+ $translated = I18n::translate($singular, $plural, null, I18n::LC_MESSAGES, $count, null, $context);
+ $arguments = func_get_args();
+ return I18n::insertArgs($translated, array_slice($arguments, 4));
+ }
+
+}
+
+if (!function_exists('__dx')) {
+
+/**
+ * Allows you to override the current domain for a single message lookup.
+ *
+ * @param string $domain Domain
+ * @param string $context Context of the text
+ * @param string $msg String to translate
+ * @param mixed $args Array with arguments or multiple arguments in function
+ * @return translated string
+ * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__d
+ */
+ function __dx($domain, $context, $msg, $args = null) {
+ if (!$msg) {
+ return;
+ }
+ App::uses('I18n', 'I18n');
+ $translated = I18n::translate($msg, null, $domain, null, null, null, $context);
+ $arguments = func_get_args();
+ return I18n::insertArgs($translated, array_slice($arguments, 3));
+ }
+
+}
+
+if (!function_exists('__dxn')) {
+
+/**
+ * Allows you to override the current domain for a single plural message lookup.
+ * Returns correct plural form of message identified by $singular and $plural for count $count
+ * from domain $domain.
+ *
+ * @param string $domain Domain
+ * @param string $context Context of the text
+ * @param string $singular Singular string to translate
+ * @param string $plural Plural
+ * @param integer $count Count
+ * @param mixed $args Array with arguments or multiple arguments in function
+ * @return plural form of translated string
+ * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dn
+ */
+ function __dxn($domain, $context, $singular, $plural, $count, $args = null) {
+ if (!$singular) {
+ return;
+ }
+ App::uses('I18n', 'I18n');
+ $translated = I18n::translate($singular, $plural, $domain, I18n::LC_MESSAGES, $count, null, $context);
+ $arguments = func_get_args();
+ return I18n::insertArgs($translated, array_slice($arguments, 5));
+ }
+
+}
+
+if (!function_exists('__dxc')) {
+
+/**
+ * Allows you to override the current domain for a single message lookup.
+ * It also allows you to specify a category.
+ *
+ * The category argument allows a specific category of the locale settings to be used for fetching a message.
+ * Valid categories are: LC_CTYPE, LC_NUMERIC, LC_TIME, LC_COLLATE, LC_MONETARY, LC_MESSAGES and LC_ALL.
+ *
+ * Note that the category must be specified with a class constant of I18n, instead of the constant name. The values are:
+ *
+ * - LC_ALL I18n::LC_ALL
+ * - LC_COLLATE I18n::LC_COLLATE
+ * - LC_CTYPE I18n::LC_CTYPE
+ * - LC_MONETARY I18n::LC_MONETARY
+ * - LC_NUMERIC I18n::LC_NUMERIC
+ * - LC_TIME I18n::LC_TIME
+ * - LC_MESSAGES I18n::LC_MESSAGES
+ *
+ * @param string $domain Domain
+ * @param string $context Context of the text
+ * @param string $msg Message to translate
+ * @param integer $category Category
+ * @param mixed $args Array with arguments or multiple arguments in function
+ * @return translated string
+ * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dc
+ */
+ function __dxc($domain, $context, $msg, $category, $args = null) {
+ if (!$msg) {
+ return;
+ }
+ App::uses('I18n', 'I18n');
+ $translated = I18n::translate($msg, null, $domain, $category, null, null, $context);
+ $arguments = func_get_args();
+ return I18n::insertArgs($translated, array_slice($arguments, 4));
+ }
+
+}
+
+if (!function_exists('__dxcn')) {
+
+/**
+ * Allows you to override the current domain for a single plural message lookup.
+ * It also allows you to specify a category.
+ * Returns correct plural form of message identified by $singular and $plural for count $count
+ * from domain $domain.
+ *
+ * The category argument allows a specific category of the locale settings to be used for fetching a message.
+ * Valid categories are: LC_CTYPE, LC_NUMERIC, LC_TIME, LC_COLLATE, LC_MONETARY, LC_MESSAGES and LC_ALL.
+ *
+ * Note that the category must be specified with a class constant of I18n, instead of the constant name. The values are:
+ *
+ * - LC_ALL I18n::LC_ALL
+ * - LC_COLLATE I18n::LC_COLLATE
+ * - LC_CTYPE I18n::LC_CTYPE
+ * - LC_MONETARY I18n::LC_MONETARY
+ * - LC_NUMERIC I18n::LC_NUMERIC
+ * - LC_TIME I18n::LC_TIME
+ * - LC_MESSAGES I18n::LC_MESSAGES
+ *
+ * @param string $domain Domain
+ * @param string $context Context of the text
+ * @param string $singular Singular string to translate
+ * @param string $plural Plural
+ * @param integer $count Count
+ * @param integer $category Category
+ * @param mixed $args Array with arguments or multiple arguments in function
+ * @return plural form of translated string
+ * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__dcn
+ */
+ function __dxcn($domain, $context, $singular, $plural, $count, $category, $args = null) {
+ if (!$singular) {
+ return;
+ }
+ App::uses('I18n', 'I18n');
+ $translated = I18n::translate($singular, $plural, $domain, $category, $count, null, $context);
+ $arguments = func_get_args();
+ return I18n::insertArgs($translated, array_slice($arguments, 6));
+ }
+
+}
+
+if (!function_exists('__xc')) {
+
+/**
+ * The category argument allows a specific category of the locale settings to be used for fetching a message.
+ * Valid categories are: LC_CTYPE, LC_NUMERIC, LC_TIME, LC_COLLATE, LC_MONETARY, LC_MESSAGES and LC_ALL.
+ *
+ * Note that the category must be specified with a class constant of I18n, instead of the constant name. The values are:
+ *
+ * - LC_ALL I18n::LC_ALL
+ * - LC_COLLATE I18n::LC_COLLATE
+ * - LC_CTYPE I18n::LC_CTYPE
+ * - LC_MONETARY I18n::LC_MONETARY
+ * - LC_NUMERIC I18n::LC_NUMERIC
+ * - LC_TIME I18n::LC_TIME
+ * - LC_MESSAGES I18n::LC_MESSAGES
+ *
+ * @param string $context Context of the text
+ * @param string $msg String to translate
+ * @param integer $category Category
+ * @param mixed $args Array with arguments or multiple arguments in function
+ * @return translated string
+ * @link http://book.cakephp.org/2.0/en/core-libraries/global-constants-and-functions.html#__c
+ */
+ function __xc($context, $msg, $category, $args = null) {
+ if (!$msg) {
+ return;
+ }
+ App::uses('I18n', 'I18n');
+ $translated = I18n::translate($msg, null, null, $category, null, null, $context);
+ $arguments = func_get_args();
+ return I18n::insertArgs($translated, array_slice($arguments, 3));
}
}
Something went wrong with that request. Please try again.