Merge branch 'master' into 3.1

cakephp · Sep 18, 2015 · 89ad510 · 89ad510
2 parents 009e190 + 6a0ee6c
commit 89ad510
Show file tree

Hide file tree

Showing 10 changed files with 147 additions and 113 deletions.
diff --git a/config/app.default.php b/config/app.default.php
@@ -221,6 +221,7 @@
             'encoding' => 'utf8',
             'timezone' => 'UTC',
             'cacheMetadata' => true,
+            'log' => false,
 
             /**
              * Set identifier quoting to true if you are using reserved words or
@@ -258,6 +259,7 @@
             'timezone' => 'UTC',
             'cacheMetadata' => true,
             'quoteIdentifiers' => false,
+            'log' => false,
             //'init' => ['SET GLOBAL innodb_stats_on_metadata = 0'],
         ],
     ],

diff --git a/config/bootstrap.php b/config/bootstrap.php
@@ -199,4 +199,5 @@
  * Enable default locale format parsing.
  * This is needed for matching the auto-localized string output of Time() class when parsing dates.
  */
+Type::build('date')->useLocaleParser();
 Type::build('datetime')->useLocaleParser();
diff --git a/config/schema/sessions.sql b/config/schema/sessions.sql
@@ -1,8 +1,6 @@
 # $Id$
 #
 # Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
-#								1785 E. Sahara Avenue, Suite 490-204
-#								Las Vegas, Nevada 89104
 #
 # Licensed under The MIT License
 # For full copyright and license information, please see the LICENSE.txt

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -1,33 +1,39 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <phpunit
-	colors="true"
-	processIsolation="false"
-	stopOnFailure="false"
-	syntaxCheck="false"
-	bootstrap="./tests/bootstrap.php"
-	>
-	<php>
-		<ini name="memory_limit" value="-1"/>
-		<ini name="apc.enable_cli" value="1"/>
-	</php>
+    colors="true"
+    processIsolation="false"
+    stopOnFailure="false"
+    syntaxCheck="false"
+    bootstrap="./tests/bootstrap.php"
+    >
+    <php>
+        <ini name="memory_limit" value="-1"/>
+        <ini name="apc.enable_cli" value="1"/>
+    </php>
 
-	<!-- Add any additional test suites you want to run here -->
-	<testsuites>
-		<testsuite name="App Test Suite">
-			<directory>./tests/TestCase</directory>
-		</testsuite>
-		<!-- Add plugin test suites here. -->
-	</testsuites>
+    <!-- Add any additional test suites you want to run here -->
+    <testsuites>
+        <testsuite name="App Test Suite">
+            <directory>./tests/TestCase</directory>
+        </testsuite>
+        <!-- Add plugin test suites here. -->
+    </testsuites>
 
-	<!-- Setup a listener for fixtures -->
-	<listeners>
-		<listener
-		class="\Cake\TestSuite\Fixture\FixtureInjector"
-		file="./vendor/cakephp/cakephp/src/TestSuite/Fixture/FixtureInjector.php">
-			<arguments>
-				<object class="\Cake\TestSuite\Fixture\FixtureManager" />
-			</arguments>
-		</listener>
-	</listeners>
+    <!-- Setup a listener for fixtures -->
+    <listeners>
+        <listener
+        class="\Cake\TestSuite\Fixture\FixtureInjector"
+        file="./vendor/cakephp/cakephp/src/TestSuite/Fixture/FixtureInjector.php">
+            <arguments>
+                <object class="\Cake\TestSuite\Fixture\FixtureManager" />
+            </arguments>
+        </listener>
+    </listeners>
 
+    <!-- Ignore vendor tests in code coverage reports -->
+    <filter>
+        <blacklist>
+            <directory suffix=".php">./vendor/</directory>
+        </blacklist>
+    </filter>
 </phpunit>
diff --git a/src/Controller/AppController.php b/src/Controller/AppController.php
@@ -33,6 +33,8 @@ class AppController extends Controller
      *
      * Use this method to add common initialization code like loading components.
      *
+     * e.g. `$this->loadComponent('Security');`
+     *
      * @return void
      */
     public function initialize()

diff --git a/src/Template/Pages/home.ctp b/src/Template/Pages/home.ctp
@@ -46,14 +46,17 @@ $cakeDescription = 'CakePHP: the rapid development php framework';
         </div>
     </header>
     <div id="content">
-        <?php Debugger::checkSecurityKeys(); ?>
-        <p id="url-rewriting-warning" style="background-color:#e32; color:#fff;display:none">
-            URL rewriting is not properly configured on your server.
-            1) <a target="_blank" href="http://book.cakephp.org/3.0/en/installation/url-rewriting.html" style="color:#fff;">Help me configure it</a>
-            2) <a target="_blank" href="http://book.cakephp.org/3.0/en/development/configuration.html#general-configuration" style="color:#fff;">I don't / can't use URL rewriting</a>
-        </p>
-
         <div class="row">
+            <?php Debugger::checkSecurityKeys(); ?>
+            <div id="url-rewriting-warning" class="columns large-12 url-rewriting checks">
+                <p class="problem">URL rewriting is not properly configured on your server.</p>
+                <p>
+                    1) <a target="_blank" href="http://book.cakephp.org/3.0/en/installation.html#url-rewriting">Help me configure it</a>
+                </p>
+                <p>
+                    2) <a target="_blank" href="http://book.cakephp.org/3.0/en/development/configuration.html#general-configuration">I don't / can't use URL rewriting</a>
+                </p>
+            </div>
             <div class="columns large-5 platform checks">
                 <?php if (version_compare(PHP_VERSION, '5.4.16', '>=')): ?>
                     <p class="success">Your version of PHP is 5.4.16 or higher.</p>
@@ -144,7 +147,6 @@ $cakeDescription = 'CakePHP: the rapid development php framework';
                 <p>
             </div>
         </div>
-
         <hr/>
         <div class="row">
             <div class="columns large-12">
@@ -155,7 +157,6 @@ $cakeDescription = 'CakePHP: the rapid development php framework';
                 <p>
                     Our primary goal is to provide a structured framework that enables PHP users at all levels to rapidly develop robust web applications, without any loss to flexibility.
                 </p>
-
                 <ul>
                     <li><a href="http://cakefoundation.org/">Cake Software Foundation</a>
                     <ul><li>Promoting development related to CakePHP</li></ul></li>
@@ -177,6 +178,10 @@ $cakeDescription = 'CakePHP: the rapid development php framework';
                     <ul><li>For the Development of CakePHP Git repository, Downloads</li></ul></li>
                     <li><a href="https://github.com/cakephp/cakephp/issues">CakePHP Issues</a>
                     <ul><li>CakePHP issues and pull requests</li></ul></li>
+                    <li><a href="http://training.cakephp.org/">CakePHP Training</a>
+                    <ul><li>Learn to use the CakePHP framework</li></ul></li>
+                    <li><a href="http://certification.cakephp.org/">CakePHP Certification</a>
+                    <ul><li>Become a certified CakePHP developer</li></ul></li>
                 </ul>
             </div>
         </div>

diff --git a/src/View/AjaxView.php b/src/View/AjaxView.php
@@ -20,16 +20,16 @@
 
 /**
  * A view class that is used for AJAX responses.
- * Currently only switches the default layout and sets the response type - which just maps to
- * text/html by default.
+ * Currently only switches the default layout and sets the response type -
+ * which just maps to text/html by default.
  */
 class AjaxView extends AppView
 {
 
     /**
-     * The name of the layout file to render the view inside of. The name specified
-     * is the filename of the layout in /app/Template/Layout without the .ctp
-     * extension.
+     * The name of the layout file to render the view inside of. The name
+     * specified is the filename of the layout in /app/Template/Layout without
+     * the .ctp extension.
      *
      * @var string
      */

diff --git a/src/View/AppView.php b/src/View/AppView.php
@@ -16,16 +16,21 @@
 use Cake\View\View;
 
 /**
- * App View class
+ * Application View
+ *
+ * Your application’s default view class
+ *
+ * @link http://book.cakephp.org/3.0/en/views.html#the-app-view
  */
 class AppView extends View
 {
 
     /**
      * Initialization hook method.
      *
-     * For e.g. use this method to load a helper for all views:
-     * `$this->loadHelper('Html');`
+     * Use this method to add common initialization code like loading helpers.
+     *
+     * e.g. `$this->loadHelper('Html');`
      *
      * @return void
      */