Merge remote-tracking branch 'origin/1.0' into 1

# Conflicts:
#	composer.json

composer.json

@@ -5,7 +5,7 @@
     "homepage": "http://silverstripe.org",
     "license": "BSD-3-Clause",
     "require": {
-        "silverstripe/recipe-plugin": ">=0.1@dev <1.0",
+        "silverstripe/recipe-plugin": "^1",
         "silverstripe/recipe-core": "1.1.x-dev",
         "silverstripe/admin": "1.1.x-dev",
         "silverstripe/asset-admin": "1.1.x-dev",
@@ -34,4 +34,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
+}

mysite/code/Page.php

@@ -4,9 +4,7 @@ use SilverStripe\CMS\Model\SiteTree;
 
 class Page extends SiteTree
 {
-    private static $db = array(
-    );
+    private static $db = [];
 
-    private static $has_one = array(
-    );
+    private static $has_one = [];
 }

mysite/code/PageController.php

@@ -9,19 +9,17 @@ class PageController extends ContentController
      * permissions or conditions required to allow the user to access it.
      *
      * <code>
-     * array (
+     * [
      *     'action', // anyone can access this action
      *     'action' => true, // same as above
      *     'action' => 'ADMIN', // you must have ADMIN permissions to access this action
      *     'action' => '->checkAction' // you can only access this action if $this->checkAction() returns true
-     * );
+     * ];
      * </code>
      *
      * @var array
      */
-    private static $allowed_actions = array(
-
-    );
+    private static $allowed_actions = [];
 
     protected function init()
     {