NEW: Add phpstan level 1 analysis

composer.json

@@ -55,7 +55,8 @@
         "sminnee/phpunit": "^5.7.29",
         "sminnee/phpunit-mock-objects": "^3.4.9",
         "silverstripe/versioned": "^1",
-        "squizlabs/php_codesniffer": "^3.5"
+        "squizlabs/php_codesniffer": "^3.5",
+        "phpstan/phpstan": "^0.12.71"
     },
     "provide": {
         "psr/container-implementation": "1.0.0"

phpstan.neon.dist

@@ -0,0 +1,47 @@
+parameters:
+  level: 1
+  paths:
+   - src
+  excludePaths:
+  # Attempts to link the Parser from php-peg crash phpstan
+   - src/View/SSTemplateParseException.php
+   - src/View/SSTemplateParser.php
+  ignoreErrors:
+    -
+      message: '#Class SilverStripe\\Admin\\LeftAndMain not found.#'
+      path: src/Forms/GridField/GridFieldDetailForm_ItemRequest.php
+    -
+      message: '#Class SilverStripe\\CMS\\Model\\SiteTree not found#'
+      path: src/Core/ClassInfo.php
+    -
+      message: '#Class SilverStripe\\CMS\\Model\\SiteTree not found#'
+      path: src/ORM/Search/FulltextSearchable.php
+    -
+      message: '#Class SilverStripe\\CMS\\Model\\SiteTree not found#'
+      path: src/ORM/Connect/MySQLDatabase.php
+    -
+      message: '#Class Page not found#'
+      path: src/Security/Security.php
+    -
+      message: '#Constructor of class .* has an unused parameter \$form#'
+      path: src/Forms/ConfirmedPasswordField.php
+    -
+      message: '#Constructor of class .* has an unused parameter \$extraFields.#'
+      path: src/ORM/ManyManyThroughList.php
+    -
+      message: '#Constructor of class .* has an unused parameter \$database.#'
+      path: src/ORM/Connect/MySQLQuery.php
+    -
+      message: '#Constructor of class .* has an unused parameter \$validator.#'
+      path: src/Security/LogoutForm.php
+    -
+      message: '#Class Parser was not found while trying to analyse it - discovering symbols is probably not configured properly.#'
+      path: src/View/SSTemplateParser.php
+    -
+      message: '#Class Parser was not found while trying to analyse it - discovering symbols is probably not configured properly.#'
+      path: src/View/SSTemplateParseException.php
+
+
+  scanDirectories:
+    - thirdparty/simpletest
+    - thirdparty/difflib

src/Control/Controller.php

@@ -397,8 +397,6 @@ public function getViewer($action)
             $templates = $this->templates[$action];
         } elseif (isset($this->templates['index']) && $this->templates['index']) {
             $templates = $this->templates['index'];
-        } elseif ($this->template) {
-            $templates = $this->template;
         } else {
             // Build templates based on class hierarchy
             $actionTemplates = [];

src/Control/HTTPStreamResponse.php

@@ -91,7 +91,7 @@ public function getSavedBody()
     public function getBody()
     {
         $body = $this->getSavedBody();
-        if (isset($body)) {
+        if ($body !== null) {
             return $body;
         }
 

src/Control/SimpleResourceURLGenerator.php

@@ -102,6 +102,8 @@ public function urlForResource($relativePath)
         // Apply nonce
         // Don't add nonce to directories
         if ($this->nonceStyle && $exists && is_file($absolutePath)) {
+            $method = null;
+
             switch ($this->nonceStyle) {
                 case 'mtime':
                     $method = 'filemtime';
@@ -114,10 +116,12 @@ public function urlForResource($relativePath)
                     break;
             }
 
-            if ($query) {
-                $query .= '&';
+            if ($method && function_exists($method)) {
+                if ($query) {
+                    $query .= '&';
+                }
+                $query .= "m=" . call_user_func($method, $absolutePath);
             }
-            $query .= "m=" . call_user_func($method, $absolutePath);
         }
 
         // Add back querystring

src/Core/Config/ConfigLoader.php

@@ -26,9 +26,10 @@ class ConfigLoader
      */
     public static function inst()
     {
-        return self::$instance ? self::$instance : self::$instance = new static();
+        return self::$instance ? self::$instance : self::$instance = new self();
     }
 
+
     /**
      * Returns the currently active class manifest instance that is used for
      * loading classes.
@@ -97,7 +98,7 @@ public function nest()
         $manifest = clone $this->getManifest();
 
         // Create new blank loader with new stack (top level nesting)
-        $newLoader = new static;
+        $newLoader = new self();
         $newLoader->pushManifest($manifest);
 
         // Activate new loader

src/Core/Environment.php

@@ -113,7 +113,7 @@ public static function increaseMemoryLimitTo($memoryLimit = -1)
      */
     static function setMemoryLimitMax($memoryLimit)
     {
-        if (isset($memoryLimit) && !is_numeric($memoryLimit)) {
+        if ($memoryLimit !== null && !is_numeric($memoryLimit)) {
             $memoryLimit = Convert::memstring2bytes($memoryLimit);
         }
         static::$memoryLimitMax = $memoryLimit;

src/Core/Injector/InjectorLoader.php

@@ -25,7 +25,7 @@ class InjectorLoader
      */
     public static function inst()
     {
-        return self::$instance ? self::$instance : self::$instance = new static();
+        return self::$instance ? self::$instance : self::$instance = new self();
     }
 
     /**
@@ -96,7 +96,7 @@ public function nest()
         $manifest = clone $this->getManifest();
 
         // Create new blank loader with new stack (top level nesting)
-        $newLoader = new static;
+        $newLoader = new self();
         $newLoader->pushManifest($manifest);
 
         // Activate new loader

src/Core/Manifest/ClassLoader.php

@@ -30,7 +30,7 @@ class ClassLoader
      */
     public static function inst()
     {
-        return self::$instance ? self::$instance : self::$instance = new static();
+        return self::$instance ? self::$instance : self::$instance = new self();
     }
 
     /**

src/Core/Manifest/ClassManifest.php

@@ -513,7 +513,7 @@ public function regenerate($includeTests)
             'name_regex' => '/^[^_].*\\.php$/',
             'ignore_files' => ['index.php', 'cli-script.php'],
             'ignore_tests' => !$includeTests,
-            'file_callback' => function ($basename, $pathname, $depth) use ($includeTests, $finder) {
+            'file_callback' => function ($basename, $pathname, $depth) use ($includeTests) {
                 $this->handleFile($basename, $pathname, $includeTests);
             },
         ]);

src/Core/Manifest/ModuleLoader.php

@@ -22,7 +22,7 @@ class ModuleLoader
      */
     public static function inst()
     {
-        return self::$instance ? self::$instance : self::$instance = new static();
+        return self::$instance ? self::$instance : self::$instance = new self();
     }
 
     /**

src/Core/Manifest/VersionProvider.php

@@ -146,9 +146,9 @@ protected function getComposerLock($cache = true)
         $jsonData = file_get_contents($composerLockPath);
 
         if ($cache) {
-            $cache = Injector::inst()->get(CacheInterface::class . '.VersionProvider_composerlock');
+            $cacheStore = Injector::inst()->get(CacheInterface::class . '.VersionProvider_composerlock');
             $cacheKey = md5($jsonData);
-            if ($versions = $cache->get($cacheKey)) {
+            if ($versions = $cacheStore->get($cacheKey)) {
                 $lockData = json_decode($versions, true);
             }
         }
@@ -157,7 +157,7 @@ protected function getComposerLock($cache = true)
             $lockData = json_decode($jsonData, true);
 
             if ($cache) {
-                $cache->set($cacheKey, $jsonData);
+                $cacheStore->set($cacheKey, $jsonData);
             }
         }
 

src/Core/Startup/AbstractConfirmationToken.php

@@ -31,6 +31,11 @@ abstract class AbstractConfirmationToken
      */
     protected $token = null;
 
+    /**
+     * Create a token with the given name for the given request
+     */
+    abstract function __construct($parameterName, HTTPRequest $request);
+
     /**
      * Given a list of token names, suppress all tokens that have not been validated, and
      * return the non-validated token with the highest priority

src/Dev/CsvBulkLoader.php

@@ -96,6 +96,7 @@ protected function processAll($filepath, $preview = false)
                 return $row;
             };
 
+            $headerMap = null;
             if ($this->columnMap) {
                 $headerMap = $this->getNormalisedColumnMap();
 
@@ -125,12 +126,14 @@ protected function processAll($filepath, $preview = false)
                     $csvReader->setHeaderOffset(0);
                     $rows = new MapIterator($csvReader->getRecords(), $remapper);
                 }
-            } elseif ($this->columnMap) {
+            } elseif ($headerMap) {
                 if (method_exists($csvReader, 'fetchAssoc')) {
                     $rows = $csvReader->fetchAssoc($headerMap, $remapper);
                 } else {
                     $rows = new MapIterator($csvReader->getRecords($headerMap), $remapper);
                 }
+            } else {
+                $rows = [];
             }
 
             foreach ($rows as $row) {

src/Dev/DebugView.php

@@ -30,38 +30,7 @@ class DebugView
     private static $columns = 100;
 
     protected static $error_types = [
-        0 => [
-            'title' => 'Emergency',
-            'class' => 'error'
-        ],
-        1 => [
-            'title' => 'Alert',
-            'class' => 'error'
-        ],
-        2 => [
-            'title' => 'Critical',
-            'class' => 'error'
-        ],
-        3 => [
-            'title' => 'Error',
-            'class' => 'error'
-        ],
-        4 =>  [
-            'title' => 'Warning',
-            'class' => 'warning'
-        ],
-        5 => [
-            'title' => 'Notice',
-            'class' => 'notice'
-        ],
-        6 => [
-            'title' => 'Information',
-            'class' => 'info'
-        ],
-        7=> [
-            'title' => 'SilverStripe\\Dev\\Debug',
-            'class' => 'debug'
-        ],
+
         E_USER_ERROR => [
             'title' => 'User Error',
             'class' => 'error'
@@ -86,10 +55,6 @@ class DebugView
             'title' => 'User Deprecated',
             'class' => 'notice'
         ],
-        E_CORE_ERROR => [
-            'title' => 'Core Error',
-            'class' => 'error'
-        ],
         E_WARNING => [
             'title' => 'Warning',
             'class' => 'warning'

src/Dev/Install/DatabaseAdapterRegistry.php

@@ -2,11 +2,12 @@
 
 namespace SilverStripe\Dev\Install;
 
+use Exception;
 use InvalidArgumentException;
 use Psr\SimpleCache\CacheInterface;
+use SilverStripe\Core\Flushable;
 use SilverStripe\Core\Injector\Injector;
 use SilverStripe\Dev\Deprecation;
-use SilverStripe\Core\Flushable;
 
 /**
  * This class keeps track of the available database adapters

src/Forms/FieldList.php

@@ -27,6 +27,11 @@ class FieldList extends ArrayList
      */
     protected $sequentialSaveableSet;
 
+    /**
+     * @deprecated
+     */
+    public $form;
+
     /**
      * If this fieldlist is owned by a parent field (e.g. CompositeField)
      * this is the parent field.

src/Forms/Form.php

@@ -342,13 +342,13 @@ public function restoreFormState()
     {
         // Restore messages
         $result = $this->getSessionValidationResult();
-        if (isset($result)) {
+        if ($result !== null) {
             $this->loadMessagesFrom($result);
         }
 
         // load data in from previous submission upon error
         $data = $this->getSessionData();
-        if (isset($data)) {
+        if ($data !== null) {
             $this->loadDataFrom($data, self::MERGE_AS_INTERNAL_VALUE);
         }
         return $this;

src/Forms/FormField.php

@@ -581,7 +581,7 @@ public function extraClass()
         //
         // CSS class needs to be different from the one rendered through {@link FieldHolder()}.
         if ($this->getMessage()) {
-            $classes[] .= 'holder-' . $this->getMessageType();
+            $classes[] = 'holder-' . $this->getMessageType();
         }
 
         return implode(' ', $classes);

src/Forms/GridField/GridField.php

@@ -108,6 +108,11 @@ class GridField extends FormField
      */
     protected $name = '';
 
+    /**
+     * @deprecated
+     */
+    public $id;
+
     /**
      * A whitelist of readonly component classes allowed if performReadonlyTransform is called.
      *

src/Forms/GridField/GridFieldFilterHeader.php

@@ -402,7 +402,7 @@ public function getSearchFormSchema(GridField $gridField)
             return new HTTPResponse(_t(__CLASS__ . '.SearchFormFaliure', 'No search form could be generated'), 400);
         }
 
-        $parts = $gridField->getRequest()->getHeader(LeftAndMain::SCHEMA_HEADER);
+        $parts = $gridField->getRequest()->getHeader('X-Formschema-Request');
         $schemaID = $gridField->getRequest()->getURL();
         $data = FormSchema::singleton()
             ->getMultipartSchema($parts, $schemaID, $form);

src/Forms/NullableField.php

@@ -169,7 +169,7 @@ public function setName($name)
     public function debug()
     {
         $result = sprintf(
-            '%s (%s: $s : <span style="color: red">%s</span>) = ',
+            '%s (%s: %s : <span style="color: red">%s</span>) = ',
             static::class,
             $this->name,
             $this->title,