Skip to content

Commit

Permalink
Merge branch '3.0' into 3.next
Browse files Browse the repository at this point in the history
markstory committed Jan 2, 2018
2 parents 9913806 + 5bb062b commit d078af4
Showing 391 changed files with 13,186 additions and 2,336 deletions.
1 change: 0 additions & 1 deletion en/appendices.rst
Original file line number Diff line number Diff line change
@@ -21,7 +21,6 @@ General Information
appendices/cakephp-development-process
appendices/glossary


.. meta::
:title lang=en: Appendices
:keywords lang=en: migration guide,migration path,new features,glossary
11 changes: 0 additions & 11 deletions en/appendices/3-0-migration-guide.rst
Original file line number Diff line number Diff line change
@@ -6,7 +6,6 @@ a project to 3.0, as well as a reference to get up to date with the changes made
to the core since the CakePHP 2.x branch. Be sure to read the other pages in
this guide for all the new features and API changes.


Requirements
============

@@ -90,7 +89,6 @@ Upgrading to the new ORM will require extensive changes in any application that
is being upgraded. See the new :doc:`/orm` documentation for information on how
to use the new ORM.


Basics
======

@@ -138,7 +136,6 @@ the duration on write - the duration is taken from the cache engine's runtime co
cache method with an empty key will now throw an :php:class:`InvalidArgumentException`, instead
of returning ``false``.


Core
====

@@ -332,7 +329,6 @@ Since many applications will still need to parse incoming URLs containing named
parameters. :php:meth:`Cake\\Routing\\Router::parseNamedParams()` has
been added to allow backwards compatibility with existing URLs.


RequestActionTrait
------------------

@@ -407,7 +403,6 @@ Filter\AssetFilter
* Support for the ``Asset.filter`` configuration and hooks were removed. This
feature should be replaced with a plugin or dispatcher filter.


Network
=======

@@ -490,7 +485,6 @@ Network\\Email
* :php:meth:`Cake\\Network\\Email\\Email::dropTransport()` has been added to allow the
removal of transport configuration.


Controller
==========

@@ -590,7 +584,6 @@ CookieComponent
:doc:`/controllers/components/cookie` for more information.
- The path for cookies now defaults to app's base path instead of "/".


AuthComponent
-------------

@@ -756,7 +749,6 @@ The following assertion methods have been added:

- ``assertNotWithinRange()`` as counter part to ``assertWithinRange()``


View
====

@@ -865,7 +857,6 @@ View\\Helper
- action
- params


Helper
------

@@ -1030,7 +1021,6 @@ SessionHelper
- The ``SessionHelper`` has been deprecated. You can use ``$this->request->session()`` directly,
and the flash message functionality has been moved into :doc:`/views/helpers/flash` instead.


JsHelper
--------

@@ -1121,7 +1111,6 @@ L10n

- :php:class:`Cake\\I18n\\L10n` 's constructor now takes a :php:class:`Cake\\Network\\Request` instance as argument.


Testing
=======

2 changes: 0 additions & 2 deletions en/appendices/3-1-migration-guide.rst
Original file line number Diff line number Diff line change
@@ -150,7 +150,6 @@ Query
- ``EXTRACT``, ``DATE_ADD`` and ``DAYOFWEEK`` raw SQL functions have been
abstracted to ``extract()``, ``dateAdd()`` and ``dayOfWeek()``.


View
====

@@ -221,7 +220,6 @@ Validation
- ``Validation::ascii()`` was added.
- ``Validation::utf8()`` was added.


Testing
=======

3 changes: 0 additions & 3 deletions en/appendices/3-2-migration-guide.rst
Original file line number Diff line number Diff line change
@@ -102,7 +102,6 @@ filter and converted into a response. This replaces calls to
``response->send()`` and allows dispatcher filters to interact with redirect
responses.


ORM Improvements
----------------

@@ -115,7 +114,6 @@ ORM Improvements
``invalid()`` method.
* Entity accessor method lookups are now cached and perform better.


Improved Validator API
----------------------

@@ -135,7 +133,6 @@ Console Improvements
* ``Cake\Console\Exception\StopException`` was added.
* ``Shell::abort()`` was added to replace ``error()``.


StopException Added
-------------------

2 changes: 1 addition & 1 deletion en/appendices/3-3-migration-guide.rst
Original file line number Diff line number Diff line change
@@ -26,7 +26,7 @@ Deprecations
* ``RequestActionTrait`` has been deprecated. Refactor your code to use
:doc:`/views/cells` instead.
* ``Cake\\Utility\\Crypto\\Mcrypt`` engine has been deprecated as the ``mcrypt``
extension is deprecated in PHP 7.1. Use the ``openssl`` and
extension is deprecated in PHP 7.1. Use the ``openssl`` and
:php:class:`Cake\\Utility\\Crypto\\Openssl` instead.

Behavior Changes
3 changes: 1 addition & 2 deletions en/appendices/3-4-migration-guide.rst
Original file line number Diff line number Diff line change
@@ -122,7 +122,7 @@ Other Deprecations
* ``FormHelper::input()`` is deprecated. Use ``FormHelper::control()`` instead.
* ``FormHelper::inputs()`` is deprecated. Use ``FormHelper::controls()`` instead.
* ``FormHelper::allInputs()`` is deprecated. Use ``FormHelper::allControls()`` instead.
* ``Mailer::layout()`` is deprecated. Use ``Mailer::setLayout()`` provided by
* ``Mailer::layout()`` is deprecated. Use ``Mailer::setLayout()`` provided by
``Mailer::__call()`` instead.

Deprecated Combined Get/Set Methods
@@ -371,7 +371,6 @@ your ``use`` statement to look like::
getMailer as public;
}


Collection
==========

4 changes: 0 additions & 4 deletions en/appendices/glossary.rst
Original file line number Diff line number Diff line change
@@ -36,7 +36,6 @@ Glossary
]
]


DRY
Don't repeat yourself. Is a principle of software development aimed at
reducing repetition of information of all kinds. In CakePHP DRY is used
@@ -65,7 +64,6 @@ Glossary
// Would generate
checked="checked"


PaaS
Platform as a Service. Platform as a Service providers will provide
cloud based hosting, database and caching resources. Some popular
@@ -84,7 +82,6 @@ Glossary
// The plugin is "AcmeCorp/Tools", and the class name is "Toolbar".
'AcmeCorp/Tools.Toolbar'


routes.php
A file in ``config`` directory that contains routing configuration.
This file is included before each request is processed.
@@ -97,7 +94,6 @@ Glossary

['controller' => 'Posts', 'action' => 'view', 5]


.. meta::
:title lang=en: Glossary
:keywords lang=en: html attributes,array class,array controller,glossary glossary,target blank,fields,properties,columns,dot notation,routing configuration,forgery,replay,router,syntax,config,submissions
5 changes: 2 additions & 3 deletions en/bake/usage.rst
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
Code Generation with Bake
#########################

The cake console is run using the PHP CLI (command line interface).
The cake console is run using the PHP CLI (command line interface).
If you have problems running the script, ensure that:

#. You have the PHP CLI installed and that it has the proper modules enabled (eg: MySQL, intl).
#. You have the PHP CLI installed and that it has the proper modules enabled (eg: MySQL, intl).
#. Users also might have issues if the database host is 'localhost' and should try '127.0.0.1' instead, as localhost can cause issues with PHP CLI.
#. Depending on how your computer is configured, you may have to set execute rights on the cake bash script to call it using ``bin/cake bake``.

@@ -50,7 +50,6 @@ tasks. You should see something like::

By using `cake bake [name]` you can invoke a specific bake task.


You can get more information on what each task does, and what options are
available using the ``--help`` option::

2 changes: 1 addition & 1 deletion en/chronos.rst
Original file line number Diff line number Diff line change
@@ -141,7 +141,7 @@ It is also possible to make big jumps to defined points in time::
$time->endOfDay();
$time->startOfMonth();
$time->endOfMonth();
$time->startOfYear();
$time->startOfYear();
$time->endOfYear();
$time->startOfWeek();
$time->endOfWeek();
1 change: 0 additions & 1 deletion en/console-and-shells.rst
Original file line number Diff line number Diff line change
@@ -243,7 +243,6 @@ You can also access tasks directly from the command line::
In order to access tasks directly from the command line, the task
**must** be included in the shell class' $tasks property.


Also, the task name must be added as a sub-command to the Shell's OptionParser::

public function getOptionParser()
1 change: 0 additions & 1 deletion en/console-and-shells/completion-shell.rst
Original file line number Diff line number Diff line change
@@ -139,7 +139,6 @@ in order to get autocompletion when using the CakePHP console::

complete -F _cake cake bin/cake


Using autocompletion
====================

1 change: 0 additions & 1 deletion en/console-and-shells/helpers.rst
Original file line number Diff line number Diff line change
@@ -51,7 +51,6 @@ We can then use this new helper in one of our shell commands by calling it::
// With ~~~~ on either side
$this->helper('Heading')->output(['It works!', '~', 4]);


Helpers generally implement the ``output()`` method which takes an array of
parameters. However, because Console Helpers are vanilla classes they can
implement additional methods that take any form of arguments.
1 change: 0 additions & 1 deletion en/console-and-shells/routes-shell.rst
Original file line number Diff line number Diff line change
@@ -27,7 +27,6 @@ in quotes::

bin/cake routes check "/bookmarks/?page=1&sort=title&direction=desc"


Testing URL Generation
----------------------

2 changes: 0 additions & 2 deletions en/contributing.rst
Original file line number Diff line number Diff line change
@@ -13,8 +13,6 @@ cover the various ways you can contribute to CakePHP:
contributing/cakephp-coding-conventions
contributing/backwards-compatibility



.. meta::
:title lang=en: Contributing
:keywords lang=en: coding conventions,documentation,maxdepth
1 change: 0 additions & 1 deletion en/contributing/backwards-compatibility.rst
Original file line number Diff line number Diff line change
@@ -164,7 +164,6 @@ In a minor release you can:
| Change method type void | Yes |
+-------------------------------+--------------------------+


.. [1] Your code *may* be broken by minor releases. Check the migration guide
for details.
.. [2] You can change a class/method name as long as the old name remains
11 changes: 6 additions & 5 deletions en/contributing/cakephp-coding-conventions.rst
Original file line number Diff line number Diff line change
@@ -82,7 +82,10 @@ Line Length
===========

It is recommended to keep lines at approximately 100 characters long for better
code readability. Lines must not be longer than 120 characters.
code readability. A limit of 80 or 120 characters makes it necessary to
distribute complex logic or expressions by function, as well as give functions
and objects shorter, more expressive names. Lines must not be
longer than 120 characters.

In short:

@@ -155,7 +158,6 @@ the condition check of the ternary for clarity::
// Nested ternaries are bad
$variable = isset($options['variable']) ? isset($options['othervar']) ? true : false : false;


Template Files
--------------

@@ -174,7 +176,6 @@ tags::
<p>You are the admin user.</p>
<?php endif; ?>


Comparison
==========

@@ -220,7 +221,7 @@ Example of a method definition::
if (expr) {
statement;
}

return $var;
}

@@ -239,7 +240,7 @@ it can be determined whether the function call was successful::
if (!($dnsInfo) || !($dnsInfo['phpType'])) {
return $this->addError();
}

return true;
}

3 changes: 0 additions & 3 deletions en/contributing/code.rst
Original file line number Diff line number Diff line change
@@ -80,7 +80,6 @@ following:
* Add a test case to show the bug is fixed, or that the new feature works.
* Keep your commits logical, and write good clear and concise commit messages.


Submitting a Pull Request
=========================

@@ -131,7 +130,6 @@ branch, as you cannot edit it once the pull request is created.
``3.2.2`` then the next time existing behavior can be broken will be in
``4.x`` so you should target that branch.


.. note::

Remember that all code you contribute to CakePHP will be licensed under the
@@ -143,7 +141,6 @@ branch, as you cannot edit it once the pull request is created.
All bug fixes merged into a maintenance branch will also be merged into upcoming
releases periodically by the core team.


.. meta::
:title lang=en: Code
:keywords lang=en: cakephp source code,code patches,test ref,descriptive name,bob barker,initial setup,global user,database connection,clone,repository,user information,enhancement,back patches,checkout
6 changes: 0 additions & 6 deletions en/contributing/documentation.rst
Original file line number Diff line number Diff line change
@@ -77,7 +77,6 @@ For example, if a new English file is created in **en/file.rst**, we should:
:title lang=xx: File Title
:keywords lang=xx: title, description,...


Translator tips
---------------

@@ -314,7 +313,6 @@ Each directive populates the index, and or the namespace index.

Method description


Attributes, methods and constants don't need to be nested. They can also just
follow the class declaration::

@@ -326,7 +324,6 @@ Each directive populates the index, and or the namespace index.

Text about the method


.. seealso:: :rst:dir:`php:method`, :rst:dir:`php:attr`, :rst:dir:`php:const`

.. rst:directive:: .. php:method:: name(signature)
@@ -409,7 +406,6 @@ matching directive is found:
Reference an exception.


Source Code
-----------

@@ -427,7 +423,6 @@ block must be indented, and like all paragraphs be separated by single lines::
Literal text is not modified or formatted, save that one level of indentation
is removed.


Notes and Warnings
------------------

@@ -483,7 +478,6 @@ Samples

This old feature was deprecated on version 2.6.3


.. meta::
:title lang=en: Documentation
:keywords lang=en: partial translations,translation efforts,html entities,text markup,asfd,asdf,structured text,english content,markdown,formatted text,dot org,repo,consistency,translator,freenode,textile,improvements,syntax,cakephp,submission
1 change: 0 additions & 1 deletion en/contributing/tickets.rst
Original file line number Diff line number Diff line change
@@ -45,7 +45,6 @@ CakePHP team will take the following actions:
* Release new versions of all affected versions.
* Prominently feature the problem in the release announcement.


.. meta::
:title lang=en: Tickets
:keywords lang=en: bug reporting system,code snippet,reporting security,private mailing,release announcement,google,ticket system,core team,security issue,bug tracker,irc channel,test cases,support questions,bug report,security issues,bug reports,exploits,vulnerability,repository
Loading

0 comments on commit d078af4

Please sign in to comment.