added strict types declaration to all files, fixed issue with helper class cannot be instantiated, fixed typo, fixed issue with controllers in subdirectories cannot be loaded correctly, added missing dependencies, made /htdocs the default folder (instead of public), added core and community folders also to autoloader, removed default path in extension.neon (because this cannot be overwritten)

Author: ma4nn

.gitignore

@@ -1,2 +1,3 @@
 /composer.lock
 /vendor/
+.idea

README.md

@@ -4,8 +4,6 @@ Extension for [PHPStan](https://github.com/phpstan/phpstan) to allow analysis of
 
 Currently it assumes Magento is installed in the public/ directory of the project root. Further work is needed in phpstan itself to allow more intellegence for extensions to be more customised whilst working with both phpstan/phpstan and phpstan/phpstan-shim.
 
-By default phpstan with this extension will test public/app/code/local only.
-
 ## Usage
 
 Add `phpstan.neon` to your Magento 1 project.
@@ -33,6 +31,8 @@ composer require inviqa/phpstan-magento1 phpstan/phpstan-shim
 
 ## Alternative Magento path
 
+By default this extension assumes the Magento directory is `%currentWorkingDirectory%/htdocs`.
+
 Add to the project's phpstan.neon:
 
 ```neon

composer.json

@@ -1,9 +1,14 @@
 {
-    "name": "inviqa/phpstan-magento1",
+    "name": "vianetz/phpstan-magento1",
     "description": "Extension for PHPStan to allow analysis of Magento 1 code.",
     "type": "library",
     "require": {
-        "phpstan/phpstan": "0.11.*"
+        "phpstan/phpstan": "0.11.*",
+        "php": ">= 7.0",
+        "nikic/php-parser": "^4.4"
+    },
+    "replace": {
+        "inviqa/phpstan-magento1": "0.1.5"
     },
     "autoload": {
         "psr-4": {

extension.neon

@@ -1,11 +1,11 @@
 parameters:
     vendor_path: %currentWorkingDirectory%/vendor
-    paths:
-        - %currentWorkingDirectory%/public/app/code/local
-    bootstrap: %vendor_path%/inviqa/phpstan-magento1/phpstan-bootstrap.php
+    bootstrap: %vendor_path%/vianetz/phpstan-magento1/phpstan-bootstrap.php
     excludes_analyse:
-        - %currentWorkingDirectory%/public/app/code/local/*/*/data/*
-        - %currentWorkingDirectory%/public/app/code/local/*/*/sql/*
+        - %currentWorkingDirectory%/htdocs/app/code/local/*/*/data/*
+        - %currentWorkingDirectory%/htdocs/app/code/local/*/*/sql/*
+    autoload_files:
+        - %currentWorkingDirectory%/htdocs/app/Mage.php
 
 services:
     -

phpstan-bootstrap.php

@@ -2,11 +2,9 @@
 
 use PHPStanMagento1\Autoload\Magento\ModuleControllerAutoloader;
 
-if (!class_exists(Mage::class)) {
-    require_once __DIR__ . '/../../../public/app/Mage.php';
-}
-
 (new ModuleControllerAutoloader('local'))->register();
+(new ModuleControllerAutoloader('core'))->register();
+(new ModuleControllerAutoloader('community'))->register();
 
 // workaround Magento's use of date phpdoc typehint for string type
 // better would be to implement the typehint to make it appear string type

src/Autoload/Magento/ModuleControllerAutoloader.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PHPStanMagento1\Autoload\Magento;
 
@@ -17,7 +18,7 @@ class ModuleControllerAutoloader
 
     public function __construct($codePool, $magentoRoot = null)
     {
-        if (empty($magentRoot)) {
+        if (empty($magentoRoot)) {
             $mageClass = new ReflectionClass(Mage::class);
             if ($mageClass->getFileName() !== false) {
                 $magentoRoot = dirname($mageClass->getFileName(), 2);
@@ -37,7 +38,8 @@ public function register()
     public function autoload($className)
     {
         if (preg_match('/^([a-zA-Z0-9\x7f-\xff]*)_([a-zA-Z0-9\x7f-\xff]*)_([a-zA-Z0-9_\x7f-\xff]+)/', $className, $match) === 1) {
-            $controllerFilename = sprintf('%s/app/code/%s/%s/%s/controllers/%s.php', $this->magentoRoot, $this->codePool, $match[1], $match[2], $match[3]);
+            $class = str_replace('_', '/', $match[3]);
+            $controllerFilename = sprintf('%s/app/code/%s/%s/%s/controllers/%s.php', $this->magentoRoot, $this->codePool, $match[1], $match[2], $class);
             if (file_exists($controllerFilename)) {
                 (function ($file) {
                     include $file;

src/Reflection/Varien/Object/MagicMethodReflection.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PHPStanMagento1\Reflection\Varien\Object;
 

src/Reflection/Varien/Object/MagicMethodsReflectionExtension.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PHPStanMagento1\Reflection\Varien\Object;
 

src/Type/Mage/Core/Model/Layout/HelperMethodsReturnTypeExtension.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PHPStanMagento1\Type\Mage\Core\Model\Layout;
 

src/Type/Mage/HelperMethodsReturnTypeExtension.php

@@ -1,4 +1,5 @@
 <?php
+declare(strict_types=1);
 
 namespace PHPStanMagento1\Type\Mage;
 
@@ -8,6 +9,7 @@
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\ShouldNotHappenException;
 use PHPStan\Type\DynamicStaticMethodReturnTypeExtension;
+use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\Type;
 
@@ -42,6 +44,11 @@ public function getTypeFromStaticMethodCall(MethodReflection $methodReflection,
 
         $name = $methodCall->args[0]->value->value;
         $class = $this->getClassFromHelperMethod($methodReflection->getName(), $name);
+
+        if ($class === false) {
+            return new NullType();
+        }
+
         return new ObjectType($class);
     }