strict_types=1 (#22)

SmetDenis · web-flow · commit f2ea298caa50 · 2021-04-21T22:41:44.000+03:00
* strict_types=1
* PHP 8 (experimental)
diff --git a/.gitattributes b/.gitattributes
@@ -11,6 +11,16 @@
 # @link       https://github.com/JBZoo/Image
 #
 
+/.phan               export-ignore
+/build               export-ignore
+/tests               export-ignore
+/.editorconfig       export-ignore
+/.gitattributes      export-ignore
+/.gitignore          export-ignore
+/.travis.yml         export-ignore
+/phpunit.xml.dist    export-ignore
+/Makefile            export-ignore
+
 * text eol=lf
 
 # (binary is a macro for -text -diff)
diff --git a/.phan/config.php b/.phan/config.php
@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Image
  */
 
+declare(strict_types=1);
+
 $default = include __DIR__ . '/../vendor/jbzoo/codestyle/src/phan/default.php';
 
 return array_merge($default, [
diff --git a/.travis.yml b/.travis.yml
@@ -19,17 +19,20 @@ php:
   - 7.2
   - 7.3
   - 7.4
+  - 8.0
+  - nightly
+
+jobs:
+  fast_finish: true
+  allow_failures:
+    - php: 8.0
+    - php: nightly
 
 env:
-  global:
-    - XDEBUG_MODE=coverage
   matrix:
     - JBZOO_COMPOSER_UPDATE_FLAGS="--prefer-lowest --prefer-stable"
     - JBZOO_COMPOSER_UPDATE_FLAGS=""
 
-before_install:
-  - sudo apt-get update
-
 before_script:
   - composer self-update
 
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # JBZoo / Image
 
-[![Build Status](https://travis-ci.org/JBZoo/Image.svg)](https://travis-ci.org/JBZoo/Image)    [![Coverage Status](https://coveralls.io/repos/JBZoo/Image/badge.svg)](https://coveralls.io/github/JBZoo/Image)    [![Psalm Coverage](https://shepherd.dev/github/JBZoo/Image/coverage.svg)](https://shepherd.dev/github/JBZoo/Image)    
+[![Build Status](https://travis-ci.org/JBZoo/Image.svg)](https://travis-ci.org/JBZoo/Image)    [![Coverage Status](https://coveralls.io/repos/JBZoo/Image/badge.svg)](https://coveralls.io/github/JBZoo/Image)    [![Psalm Coverage](https://shepherd.dev/github/JBZoo/Image/coverage.svg)](https://shepherd.dev/github/JBZoo/Image)    [![PHP Strict Types](https://img.shields.io/badge/strict__types-%3D1-brightgreen)](https://www.php.net/manual/en/language.types.declarations.php#language.types.declarations.strict)    
 [![Stable Version](https://poser.pugx.org/jbzoo/image/version)](https://packagist.org/packages/jbzoo/image)    [![Latest Unstable Version](https://poser.pugx.org/jbzoo/image/v/unstable)](https://packagist.org/packages/jbzoo/image)    [![Dependents](https://poser.pugx.org/jbzoo/image/dependents)](https://packagist.org/packages/jbzoo/image/dependents?order_by=downloads)    [![GitHub Issues](https://img.shields.io/github/issues/jbzoo/image)](https://github.com/JBZoo/Image/issues)    [![Total Downloads](https://poser.pugx.org/jbzoo/image/downloads)](https://packagist.org/packages/jbzoo/image/stats)    [![GitHub License](https://img.shields.io/github/license/jbzoo/image)](https://github.com/JBZoo/Image/blob/master/LICENSE)
 
 
diff --git a/composer.json b/composer.json
@@ -29,12 +29,12 @@
         "ext-exif"    : "*",
         "ext-ctype"   : "*",
 
-        "jbzoo/utils" : "^4.2.3",
-        "jbzoo/data"  : "^4.1.2"
+        "jbzoo/utils" : "^4.3.0",
+        "jbzoo/data"  : "^4.2.0"
     },
 
     "require-dev"       : {
-        "jbzoo/toolbox-dev" : "^2.6.2"
+        "jbzoo/toolbox-dev" : "^2.10.0"
     },
 
     "autoload"          : {
diff --git a/src/Exception.php b/src/Exception.php
@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Image
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\Image;
 
 /**
diff --git a/src/Filter.php b/src/Filter.php
@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Image
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\Image;
 
 use JBZoo\Utils\Filter as VarFilter;
@@ -24,7 +26,7 @@
  * @package JBZoo\Image
  * @SuppressWarnings(PHPMD.TooManyPublicMethods)
  */
-class Filter
+final class Filter
 {
     public const BLUR_SEL  = 0;
     public const BLUR_GAUS = 1;
@@ -62,7 +64,7 @@ public static function grayscale($image): void
     public static function pixelate($image, int $blockSize = 10): void
     {
         $blockSize = VarFilter::int($blockSize);
-        imagefilter($image, IMG_FILTER_PIXELATE, $blockSize, 1);
+        imagefilter($image, IMG_FILTER_PIXELATE, $blockSize);
     }
 
     /**
diff --git a/src/Image.php b/src/Image.php
@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Image
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\Image;
 
 use JBZoo\Utils\Filter as VarFilter;
@@ -29,7 +31,7 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.ExcessiveClassLength)
  */
-class Image
+final class Image
 {
     public const LANDSCAPE = 'landscape';
     public const PORTRAIT  = 'portrait';
diff --git a/src/Text.php b/src/Text.php
@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Image
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\Image;
 
 use JBZoo\Utils\FS;
@@ -22,7 +24,7 @@
  * Class Text
  * @package JBZoo\Image
  */
-class Text
+final class Text
 {
     /**
      * @var array
diff --git a/tests/FilterTest.php b/tests/FilterTest.php
@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Image
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\PHPUnit;
 
 use JBZoo\Image\Filter;
diff --git a/tests/ImageCodestyleTest.php b/tests/ImageCodestyleTest.php
@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Image
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\PHPUnit;
 
 use Symfony\Component\Finder\Finder;
diff --git a/tests/ImageComposerTest.php b/tests/ImageComposerTest.php
@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Image
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\PHPUnit;
 
 /**
diff --git a/tests/ImageCopyrightsTest.php b/tests/ImageCopyrightsTest.php
@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Image
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\PHPUnit;
 
 /**
@@ -22,4 +24,5 @@
 class ImageCopyrightsTest extends AbstractCopyrightTest
 {
     protected $packageName = "Image";
+    protected $isPhpStrictType = true;
 }
diff --git a/tests/ImageReadmeTest.php b/tests/ImageReadmeTest.php
@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Image
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\PHPUnit;
 
 /**
@@ -23,4 +25,10 @@
 class ImageReadmeTest extends AbstractReadmeTest
 {
     protected $packageName = 'Image';
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+        $this->params['strict_types'] = true;
+    }
 }
diff --git a/tests/ImageTest.php b/tests/ImageTest.php
@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Image
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\PHPUnit;
 
 use JBZoo\Image\Exception;
diff --git a/tests/IssuesTest.php b/tests/IssuesTest.php
@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Image
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\PHPUnit;
 
 use JBZoo\Image\Image;
diff --git a/tests/ResizeTest.php b/tests/ResizeTest.php
@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Image
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\PHPUnit;
 
 use JBZoo\Image\Image;
diff --git a/tests/TestHelper.php b/tests/TestHelper.php
@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Image
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\PHPUnit;
 
 use JBZoo\Utils\FS;
diff --git a/tests/TextTest.php b/tests/TextTest.php
@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Image
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\PHPUnit;
 
 use JBZoo\Image\Image;
diff --git a/tests/TransformsTest.php b/tests/TransformsTest.php
@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Image
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\PHPUnit;
 
 use JBZoo\Image\Image;
diff --git a/tests/WatermarkTest.php b/tests/WatermarkTest.php
@@ -13,6 +13,8 @@
  * @link       https://github.com/JBZoo/Image
  */
 
+declare(strict_types=1);
+
 namespace JBZoo\PHPUnit;
 
 use JBZoo\Image\Image;
diff --git a/tests/autoload.php b/tests/autoload.php
@@ -13,12 +13,14 @@
  * @link       https://github.com/JBZoo/Image
  */
 
+declare(strict_types=1);
+
 if (!defined('ROOT_PATH')) { // for PHPUnit process isolation
-    define('ROOT_PATH', realpath('.'));
+    define('ROOT_PATH', dirname(__DIR__));
 }
 
 // main autoload
-if ($autoload = realpath('./vendor/autoload.php')) {
+if ($autoload = realpath(ROOT_PATH . '/vendor/autoload.php')) {
     require_once $autoload;
 } else {
     echo 'Please execute "composer update" !' . PHP_EOL;
