Merge branch 'release/1.5.6'

Author: rhukster

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v1.5.6
+## 12/03/2020
+
+1. [](#bugfix)
+    * Fixed incompatible `File` class
+
 # v1.5.5
 ## 12/01/2020
 

File/src/File.php

@@ -21,7 +21,7 @@ class File extends AbstractFile
     public function content($var = null)
     {
         /** @var string $content */
-        $content = parent::content();
+        $content = parent::content($var);
 
         return $content;
     }

File/src/IniFile.php

@@ -9,7 +9,7 @@
  * @author RocketTheme
  * @license MIT
  */
-class IniFile extends AbstractFile
+class IniFile extends File
 {
     /** @var string */
     protected $extension = '.ini';

File/src/JsonFile.php

@@ -9,7 +9,7 @@
  * @author RocketTheme
  * @license MIT
  */
-class JsonFile extends AbstractFile
+class JsonFile extends File
 {
     /** @var string */
     protected $extension = '.json';

File/src/LogFile.php

@@ -9,7 +9,7 @@
  * @author RocketTheme
  * @license MIT
  */
-class LogFile extends AbstractFile
+class LogFile extends File
 {
     /** @var static[] */
     static protected $instances = [];

File/src/MarkdownFile.php

@@ -13,7 +13,7 @@
  * @author RocketTheme
  * @license MIT
  */
-class MarkdownFile extends AbstractFile
+class MarkdownFile extends File
 {
     /** @var string */
     protected $extension = '.md';

File/src/MoFile.php

@@ -8,7 +8,7 @@
  * @author RocketTheme
  * @license MIT
  */
-class MoFile extends AbstractFile
+class MoFile extends File
 {
     /** @var string */
     protected $extension = '.mo';

File/src/PhpFile.php

@@ -9,7 +9,7 @@
  * @author RocketTheme
  * @license MIT
  */
-class PhpFile extends AbstractFile
+class PhpFile extends File
 {
     /** @var string */
     protected $extension = '.php';

File/src/YamlFile.php

@@ -14,7 +14,7 @@
  * @author RocketTheme
  * @license MIT
  */
-class YamlFile extends AbstractFile
+class YamlFile extends File
 {
     /** @var static[] */
     static protected $instances = [];

tests/phpstan/phpstan.neon

@@ -22,8 +22,6 @@ parameters:
         - */Rules/**
     ignoreErrors:
         - '#Unsafe usage of new static\(\)#'
-        - '#Method RocketTheme\\Toolbox\\[^:]+::offset(Set|Unset)\(\) has parameter (\$offset|\$value) with no typehint specified#'
-        - '#Method RocketTheme\\Toolbox\\[^:]+::offset(Set|Unset)\(\) has no return typehint specified#'
         -
             message: '#Trying to invoke string but it might not be a callable#'
             path: '*/Blueprints/src/BlueprintSchema.php'
@@ -34,4 +32,12 @@ parameters:
             path: '*/Event/src/Event.php'
         -
            message: '#(deprecated|compatible|expects|returns)#'
-           path: '*/Event/src/EventDispatcher.php'
+           path: '*/Event/src/EventDispatcher.php'
+
+        # File class hacks
+        -
+            message: '#RocketTheme\\Toolbox\\File\\[^:]+::content\(\) should be compatible#'
+            path: '*/File/src/*.php'
+        -
+            message: '#RocketTheme\\Toolbox\\File\\[^:]+::content\(\) expects#'
+            path: '*/File/src/*.php'