Update PHP deps (#30)

* Update deps
* Fixes Code style
* Fixed phan issues
* Missed `: void`
* Exclude PHP 8.0 in Travis

.gitattributes

@@ -12,12 +12,12 @@
 #
 
 /.github             export-ignore
-/.phan               export-ignore
 /build               export-ignore
 /tests               export-ignore
 /.editorconfig       export-ignore
 /.gitattributes      export-ignore
 /.gitignore          export-ignore
+/.phan.php           export-ignore
 /.travis.yml         export-ignore
 /phpunit.xml.dist    export-ignore
 

.github/workflows/main.yml

@@ -11,7 +11,7 @@
 # @link       https://github.com/JBZoo/Utils
 #
 
-name: Continuous Integration
+name: CI
 
 on:
   pull_request:
@@ -21,7 +21,7 @@ on:
     branches:
       - 'master'
   schedule:
-    - cron: '15 */8 * * *'
+    - cron: '50 */8 * * *'
 
 env:
   COLUMNS: 120
@@ -35,12 +35,11 @@ jobs:
       JBZOO_COMPOSER_UPDATE_FLAGS: ${{ matrix.composer_flags }}
     strategy:
       matrix:
-        php-version: [ 7.2, 7.3, 7.4 ]
+        php-version: [ 7.2, 7.3, 7.4, 8.0 ]
         experimental: [ false ]
+        coverage: [ xdebug, none ]
         composer_flags: [ "--prefer-lowest", "" ]
         include:
-          - php-version: "8.0"
-            experimental: true
           - php-version: "8.1"
             experimental: true
     steps:
@@ -49,11 +48,11 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup PHP and composer
+      - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
           php-version: ${{ matrix.php-version }}
-          coverage: xdebug
+          coverage: ${{ matrix.coverage }}
           tools: composer
 
       - name: Build the Project
@@ -64,10 +63,82 @@ jobs:
         continue-on-error: ${{ matrix.experimental }}
         run: make test --no-print-directory
 
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: PHPUnit - ${{ matrix.php-version }} - ${{ matrix.coverage }}
+          path: build/
+
+
+  linters:
+    name: Linters
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-version: [ 7.2, 7.3, 7.4, 8.0 ]
+        experimental: [ false ]
+        include:
+          - php-version: "8.1"
+            experimental: true
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          tools: composer
+
+      - name: Build the Project
+        continue-on-error: ${{ matrix.experimental }}
+        run: make update --no-print-directory
+
       - name: 👍 Code Quality
         continue-on-error: ${{ matrix.experimental }}
         run: make codestyle --no-print-directory
 
-      - name: 📝 Build All Reports at Once
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: Linters - ${{ matrix.php-version }}
+          path: build/
+
+
+  report:
+    name: Reports
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        php-version: [ 7.2, 7.3, 7.4, 8.0 ]
+        experimental: [ false ]
+        include:
+          - php-version: "8.1"
+            experimental: true
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-version }}
+          tools: composer
+
+      - name: Build the Project
+        continue-on-error: ${{ matrix.experimental }}
+        run: make update --no-print-directory
+
+      - name: 📝 Build Reports
         continue-on-error: ${{ matrix.experimental }}
         run: make report-all --no-print-directory
+
+      - name: Upload Artifacts
+        uses: actions/upload-artifact@v2
+        with:
+          name: Reports - ${{ matrix.php-version }}
+          path: build/

.phan/config.php → .phan.php

@@ -15,7 +15,7 @@
 
 declare(strict_types=1);
 
-$default = include __DIR__ . '/../vendor/jbzoo/codestyle/src/phan/default.php';
+$default = include __DIR__ . '/vendor/jbzoo/codestyle/src/phan/default.php';
 
 return array_merge($default, [
     'directory_list' => [

.travis.yml

@@ -23,13 +23,11 @@ php:
   - 7.3
   - 7.4
   - 8.0
-  - nightly
 
 matrix:
   fast_finish: true
   allow_failures:
     - php: 8.0
-    - php: nightly
 
 env:
   matrix:

composer.json

@@ -33,7 +33,7 @@
     },
 
     "require-dev"  : {
-        "jbzoo/toolbox-dev" : "^2.11.0",
+        "jbzoo/toolbox-dev" : "^2.13.1",
         "symfony/process"   : ">=4.4"
     },
 

src/Arr.php

@@ -26,7 +26,7 @@
  * @SuppressWarnings(PHPMD.TooManyPublicMethods)
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  */
-class Arr
+final class Arr
 {
     /**
      * Remove the duplicates from an array.
@@ -475,4 +475,23 @@ public static function implode(string $glue, array $array): string
 
         return $result;
     }
+
+    /**
+     * @param array                      $array
+     * @param string|float|int|bool|null $value
+     * @return array
+     */
+    public static function removeByValue(array $array, $value): array
+    {
+        return array_filter(
+            $array,
+            /**
+             * @param string|float|int|bool|null $arrayItem
+             */
+            static function ($arrayItem) use ($value): bool {
+                return $value !== $arrayItem;
+            },
+            ARRAY_FILTER_USE_BOTH
+        );
+    }
 }

src/Cli.php

@@ -26,7 +26,7 @@
  *
  * @package JBZoo\Utils
  */
-class Cli
+final class Cli
 {
     public const STDIN  = 0;
     public const STDOUT = 1;

src/Csv.php

@@ -22,7 +22,7 @@
  *
  * @package JBZoo\Utils
  */
-class Csv
+final class Csv
 {
     public const LENGTH_LIMIT = 10000000;
 

src/Dates.php

@@ -25,7 +25,7 @@
  *
  * @package JBZoo\Utils
  */
-class Dates
+final class Dates
 {
     public const MINUTE = 60;
     public const HOUR   = 3600;
@@ -110,7 +110,7 @@ public static function timezone($timezone = null): DateTimeZone
     public static function is(?string $date): bool
     {
         $time = strtotime((string)$date);
-        return $time > 10000;
+        return $time > 0;
     }
 
     /**
@@ -210,7 +210,9 @@ public static function isYesterday($time): bool
      */
     public static function formatTime(float $seconds): string
     {
-        if ($seconds < 2) {
+        $minValuableSeconds = 2;
+
+        if ($seconds < $minValuableSeconds) {
             return number_format($seconds, 3) . ' sec';
         }
 

src/Email.php

@@ -22,7 +22,7 @@
  *
  * @package JBZoo\Utils
  */
-class Email
+final class Email
 {
     /**
      * Create random email

src/Env.php

@@ -22,7 +22,7 @@
  *
  * @package JBZoo\Utils
  */
-class Env
+final class Env
 {
     public const VAR_NULL   = 1;
     public const VAR_BOOL   = 2;

src/Exception.php

@@ -21,7 +21,7 @@
  * Class Exception
  * @package JBZoo\Utils
  */
-class Exception extends \RuntimeException
+final class Exception extends \RuntimeException
 {
 
 }

src/FS.php

@@ -30,7 +30,7 @@
  * @SuppressWarnings(PHPMD.ExcessiveClassComplexity)
  * @SuppressWarnings(PHPMD.ShortClassName)
  */
-class FS
+final class FS
 {
     public const TYPE_SOCKET    = 0xC000;
     public const TYPE_SYMLINK   = 0xA000;

src/Filter.php

@@ -28,7 +28,7 @@
  * @SuppressWarnings(PHPMD.TooManyMethods)
  * @SuppressWarnings(PHPMD.TooManyPublicMethods)
  */
-class Filter
+final class Filter
 {
     /**
      * Apply custom filter to variable

src/Http.php

@@ -22,7 +22,7 @@
  *
  * @package JBZoo\Utils
  */
-class Http
+final class Http
 {
     /**
      * Transmit headers that force a browser to display the download file dialog.
@@ -164,7 +164,9 @@ public static function getHeaders(): array
                 if (0 === stripos($authorizationHeader, 'basic ')) {
                     // Decode AUTHORIZATION header into PHP_AUTH_USER and PHP_AUTH_PW when authorization header is basic
                     $exploded = explode(':', (string)base64_decode((string)substr($authorizationHeader, 6)), 2);
-                    if (count($exploded) === 2) {
+
+                    $expectedNumOfParts = 2;
+                    if (count($exploded) === $expectedNumOfParts) {
                         [$headers['PHP_AUTH_USER'], $headers['PHP_AUTH_PW']] = $exploded;
                     }
                 } elseif (empty($_SERVER['PHP_AUTH_DIGEST']) && (0 === stripos($authorizationHeader, 'digest '))) {

src/IP.php

@@ -23,7 +23,7 @@
  * @package JBZoo\Utils
  * @SuppressWarnings(PHPMD.ShortClassName)
  */
-class IP
+final class IP
 {
     /**
      * Returns the IP address of the client.
@@ -80,8 +80,9 @@ public static function v4InRange(string $ipAddress, string $range): bool
             // fix the range argument
             $blocks = explode('.', $range);
 
+            $expectedNumOfParts = 4;
             /** @phan-suppress-next-line PhanPossiblyInfiniteLoop */
-            while (count($blocks) < 4) {
+            while (count($blocks) < $expectedNumOfParts) {
                 $blocks[] = '0';
             }
 
@@ -134,15 +135,19 @@ public static function getNetMask(string $ipAddress): ?string
     {
         $ipAddressLong = ip2long($ipAddress);
 
-        $mask = 0xFFFFFFFF;
-        if (($ipAddressLong & 0x80000000) === 0) {
-            $mask = 0xFF000000;
-        } elseif (($ipAddressLong & 0xC0000000) === 0x80000000) {
-            $mask = 0xFFFF0000;
-        } elseif (($ipAddressLong & 0xE0000000) === 0xC0000000) {
-            $mask = 0xFFFFFF00;
+        $maskLevel1 = 0x80000000;
+        $maskLevel2 = 0xC0000000;
+        $maskLevel3 = 0xE0000000;
+
+        $resultMask = 0xFFFFFFFF;
+        if (($ipAddressLong & $maskLevel1) === 0) {
+            $resultMask = 0xFF000000;
+        } elseif (($ipAddressLong & $maskLevel2) === $maskLevel1) {
+            $resultMask = 0xFFFF0000;
+        } elseif (($ipAddressLong & $maskLevel3) === $maskLevel2) {
+            $resultMask = 0xFFFFFF00;
         }
 
-        return long2ip($mask) ?: null;
+        return long2ip($resultMask) ?: null;
     }
 }