Merge pull request #261 from jeremykendall/feature/remove-php71-support

Feature/remove php71 support

Author: nyamsprod

.gitignore

@@ -7,3 +7,4 @@ docs
 build
 .idea
 .php_cs.cache
+.phpunit.result.cache

.travis.yml

@@ -1,64 +1,63 @@
 language: php
-
 sudo: false
-
 cache:
-  directories:
-    - $HOME/.composer/cache
-
-env:
-  global:
-    - COMPOSER_ARGS="--no-interaction --prefer-source --no-suggest"
-
+    directories:
+        - "$HOME/.composer/cache"
 matrix:
-  include:
-    - php: 7.0
-      env:
-        - VALIDATE_CODING_STYLE=false
-        - RUN_PHPSTAN=false
-        - IGNORE_PLATFORMS=false
-    - php: 7.1
-      env:
-        - VALIDATE_CODING_STYLE=false
-        - RUN_PHPSTAN=false
-        - IGNORE_PLATFORMS=false
-    - php: 7.2
-      env:
-        - VALIDATE_CODING_STYLE=true
-        - RUN_PHPSTAN=true
-        - IGNORE_PLATFORMS=false
-    - php: 7.3
-      env:
-        - VALIDATE_CODING_STYLE=false
-        - RUN_PHPSTAN=false
-        - IGNORE_PLATFORMS=true
-    - php: 7.4
-      env:
-        - COLLECT_COVERAGE=false
-        - VALIDATE_CODING_STYLE=false
-        - RUN_PHPSTAN=false
-        - IGNORE_PLATFORMS=true
-    - php: nightly
-      env:
-        - COLLECT_COVERAGE=false
-        - IGNORE_PLATFORMS=true
-        - RUN_PHPSTAN=false
-        - VALIDATE_CODING_STYLE=false
-  allow_failures:
-    - php: nightly
-  fast_finish: true
-
+    include:
+        - php: 7.2
+          env:
+              - COLLECT_COVERAGE=false
+              - COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source --prefer-lowest --prefer-stable"
+              - RUN_PHPSTAN=false
+              - VALIDATE_CODING_STYLE=false
+        - php: 7.2
+          env:
+              - COLLECT_COVERAGE=true
+              - COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source"
+              - RUN_PHPSTAN=true
+              - VALIDATE_CODING_STYLE=true
+        - php: 7.3
+          env:
+              - COLLECT_COVERAGE=false
+              - COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source --prefer-lowest --prefer-stable"
+              - RUN_PHPSTAN=false
+              - VALIDATE_CODING_STYLE=false
+        - php: 7.3
+          env:
+              - COLLECT_COVERAGE=true
+              - COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source"
+              - RUN_PHPSTAN=true
+              - VALIDATE_CODING_STYLE=true
+        - php: 7.4
+          env:
+              - COLLECT_COVERAGE=false
+              - COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source --prefer-lowest --prefer-stable"
+              - RUN_PHPSTAN=false
+              - VALIDATE_CODING_STYLE=false
+        - php: 7.4
+          env:
+              - COLLECT_COVERAGE=true
+              - COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source"
+              - RUN_PHPSTAN=true
+              - VALIDATE_CODING_STYLE=true
+        - php: nightly
+          env:
+              - COLLECT_COVERAGE=false
+              - COMPOSER_ARGS="--no-interaction --no-suggest --prefer-source --ignore-platform-reqs"
+              - RUN_PHPSTAN=false
+              - VALIDATE_CODING_STYLE=false
+    allow_failures:
+        - php: nightly
+    fast_finish: true
 before_install:
-  - travis_retry composer self-update
-
+    - travis_retry composer self-update
 install:
-  - if [ "$IGNORE_PLATFORMS" == "true" ]; then travis_retry composer update $COMPOSER_ARGS --ignore-platform-reqs; fi
-  - if [ "$IGNORE_PLATFORMS" == "false" ]; then travis_retry composer update $COMPOSER_ARGS; fi
-
+    - travis_retry composer update $COMPOSER_ARGS
 script:
-  - if [ "$RUN_PHPSTAN" == "true" ]; then composer phpstan; fi
-  - if [ "$VALIDATE_CODING_STYLE" == "true" ]; then composer phpcs; fi
-  - composer phpunit
-
+    - if [ "$VALIDATE_CODING_STYLE" == "true" ]; then composer phpcs; fi
+    - if [ "$RUN_PHPSTAN" == "true" ]; then composer phpstan; fi
+    - composer phpunit
 after_script:
-  - if [ "$COLLECT_COVERAGE" == "true" ]; then wget https://scrutinizer-ci.com/ocular.phar && php ocular.phar code-coverage:upload --format=php-clover build/clover.xml; fi
+    - if [ "$COLLECT_COVERAGE" == "true" ]; then wget https://scrutinizer-ci.com/ocular.phar
+        && php ocular.phar code-coverage:upload --format=php-clover build/clover.xml; fi

README.md

@@ -27,7 +27,7 @@ System Requirements
 
 You need:
 
-- **PHP >= 7.0** but the latest stable version of PHP is recommended
+- **PHP >= 7.2.5** but the latest stable version of PHP is recommended
 - the `intl` extension
 
 Dependencies

composer.json

@@ -28,30 +28,33 @@
     ],
     "keywords": [
         "Public Suffix List",
+        "Top Level Domains",
         "domain parsing",
         "icann",
+        "iana",
         "idn",
+        "tld",
         "psl"
     ],
     "require": {
-        "php": ">=7.0",
+        "php": "^7.2.5",
         "ext-intl": "*",
         "psr/log": "^1.1",
         "psr/simple-cache": "^1.0.1"
     },
     "require-dev": {
         "composer/composer": "^1.6",
-        "friendsofphp/php-cs-fixer": "^2.7",
-        "mikey179/vfsstream": "^1.6",
-        "phpstan/phpstan": "^0.9.2",
-        "phpstan/phpstan-phpunit": "^0.9.4",
-        "phpstan/phpstan-strict-rules": "^0.9.0",
-        "phpunit/phpunit": "^6.3"
+        "friendsofphp/php-cs-fixer": "^2.16",
+        "mikey179/vfsstream": "^1.6.7",
+        "phpstan/phpstan": "^0.12",
+        "phpstan/phpstan-phpunit": "^0.12",
+        "phpstan/phpstan-strict-rules": "^0.12",
+        "phpunit/phpunit": "^8.0"
     },
     "suggest": {
         "psr/simple-cache-implementation": "To enable using other cache providers",
         "ext-curl": "To use the package http client",
-        "league/uri-parser": "To parse URL and validate host"
+        "league/uri": "To parse URL and validate host"
     },
     "autoload": {
         "psr-4": {

data/pdp-PSL_FULL_5a3cc7f81795bb2e48e848af42d287b4.cache

@@ -1,2 +1,17 @@
 includes:
-- vendor/phpstan/phpstan-strict-rules/rules.neon
+- vendor/phpstan/phpstan-strict-rules/rules.neon
+parameters:
+    checkMissingIterableValueType: false
+    checkGenericClassInNonGenericObjectType: false
+    ignoreErrors:
+        - message: '#Call to function is_iterable\(\) with iterable will always evaluate to true.#'
+          path: src/Cache.php
+        - message: '#Call to function is_string\(\) with string will always evaluate to true.#'
+          path: src/Cache.php
+        - message: '#Call to function is_object\(\) with \*NEVER\* will always evaluate to true.#'
+          path: src/Cache.php
+        - message: '#Else branch is unreachable because ternary operator condition is always true.#'
+          path: src/Cache.php
+        - message: '#Property Pdp\\TopLevelDomains::\$modifiedDate \(DateTimeImmutable\) does not accept DateTimeInterface.#'
+          path: src/TopLevelDomains.php
+    reportUnmatchedIgnoredErrors: true

data/pdp-RZD_FULL_f18a70477d29d525b9220612e2115345.cache

@@ -2,4 +2,24 @@ includes:
     - vendor/phpstan/phpstan-strict-rules/rules.neon
     - vendor/phpstan/phpstan-phpunit/extension.neon
     - vendor/phpstan/phpstan-phpunit/rules.neon
-    - vendor/phpstan/phpstan-phpunit/strictRules.neon
+parameters:
+    checkMissingIterableValueType: false
+    ignoreErrors:
+        - message: '#Parameter \#1 \$exception of method PHPUnit\\Framework\\TestCase::expectException\(\) expects class-string<Throwable>, string given\.#'
+          path: tests/CacheTest.php
+        - message: '#Parameter \#1 \$key of method Pdp\\Cache::get\(\) expects string, null given\.#'
+          path: tests/CacheTest.php
+        - message: '#Parameter \#3 \$ttl of method Pdp\\Cache::set\(\) expects DateInterval\|int\|null, DateTime\|false given\.#'
+          path: tests/CacheTest.php
+        - message: '#Parameter \#1 \$key of method Pdp\\Cache::set\(\) expects string, null given\.#'
+          path: tests/CacheTest.php
+        - message: '#Parameter \#1 \$key of method Pdp\\Cache::delete\(\) expects string, null given\.#'
+          path: tests/CacheTest.php
+        - message: '#Parameter \#1 \$key of method Pdp\\Cache::has\(\) expects string, null given\.#'
+          path: tests/CacheTest.php
+        - message: '#Parameter \#1 \$values of method Pdp\\Cache::setMultiple\(\) expects iterable, null given\.#'
+          path: tests/CacheTest.php
+        - message: '#Parameter \#1 \$keys of method Pdp\\Cache::getMultiple\(\) expects iterable, null given\.#'
+          path: tests/CacheTest.php
+        - message: '#Parameter \#1 \$keys of method Pdp\\Cache::deleteMultiple\(\) expects iterable, null given\.#'
+          path: tests/CacheTest.php

phpstan.src.neon

@@ -12,24 +12,20 @@
          stopOnFailure="false">
 
     <testsuites>
-        <testsuite name="Uri Hostname Parser Test Suite">
+        <testsuite name="PHP Domain Parser Test Suite">
             <directory>tests</directory>
         </testsuite>
     </testsuites>
 
     <filter>
         <whitelist>
             <directory suffix=".php">src</directory>
-            <exclude>
-                <directory suffix="include.php">src</directory>
-            </exclude>
-            <exclude>src/Installer</exclude>
         </whitelist>
     </filter>
 
     <logging>
         <log type="junit" target="build/report.junit.xml"/>
-        <log type="coverage-html" target="build/coverage" charset="UTF-8" yui="true" highlight="true"/>
+        <log type="coverage-html" target="build/coverage"/>
         <log type="coverage-text" target="build/coverage.txt"/>
         <log type="coverage-clover" target="build/clover.xml"/>
     </logging>

phpstan.tests.neon

@@ -16,21 +16,20 @@
 namespace Pdp;
 
 use DateInterval;
+use DateTimeImmutable;
 use FilesystemIterator;
 use Generator;
 use InvalidArgumentException;
 use Psr\SimpleCache\CacheInterface;
-use Traversable;
 use function chmod;
-use function date_create_immutable;
 use function dirname;
 use function file_exists;
 use function file_get_contents;
 use function filemtime;
 use function get_class;
 use function gettype;
-use function is_array;
 use function is_int;
+use function is_iterable;
 use function is_object;
 use function is_writable;
 use function mkdir;
@@ -83,6 +82,7 @@ final class Cache implements CacheInterface
     public function __construct(string $cache_path = '')
     {
         if ('' === $cache_path) {
+            /** @var string $cache_path */
             $cache_path = realpath(dirname(__DIR__).DIRECTORY_SEPARATOR.'data');
         }
 
@@ -182,7 +182,9 @@ private function getExpireAt($ttl): int
         }
 
         if ($ttl instanceof DateInterval) {
-            return date_create_immutable('@'.time())->add($ttl)->getTimestamp();
+            $now = new DateTimeImmutable('@'.time());
+
+            return $now->add($ttl)->getTimestamp();
         }
 
         throw new CacheException(sprintf('Expected TTL to be an int, a DateInterval or null; received "%s"', is_object($ttl) ? get_class($ttl) : gettype($ttl)));
@@ -218,13 +220,13 @@ public function clear()
      */
     public function getMultiple($keys, $default = null)
     {
-        if (!is_array($keys) && !$keys instanceof Traversable) {
+        if (!is_iterable($keys)) {
             throw new CacheException('keys must be either of type array or Traversable');
         }
 
         $values = [];
         foreach ($keys as $key) {
-            $values[$key] = $this->get($key) ?: $default;
+            $values[$key] = $this->get($key) ?? $default;
         }
 
         return $values;
@@ -235,7 +237,7 @@ public function getMultiple($keys, $default = null)
      */
     public function setMultiple($values, $ttl = null)
     {
-        if (!is_array($values) && !$values instanceof Traversable) {
+        if (!is_iterable($values)) {
             throw new CacheException('keys must be either of type array or Traversable');
         }
 
@@ -252,22 +254,28 @@ public function setMultiple($values, $ttl = null)
     /**
      * {@inheritdoc}
      */
-    public function deleteMultiple($keys)
+    public function deleteMultiple($keys): bool
     {
-        if (!is_array($keys) && !$keys instanceof Traversable) {
+        if (!is_iterable($keys)) {
             throw new CacheException('keys must be either of type array or Traversable');
         }
 
+        $successful = false;
         foreach ($keys as $key) {
             $this->validateKey($key);
-            $this->delete($key);
+            $successful = $this->delete($key);
+            if (false === $successful) {
+                break;
+            }
         }
+
+        return $successful;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function has($key)
+    public function has($key): bool
     {
         return $this->get($key, $this) !== $this;
     }
@@ -288,16 +296,14 @@ private function getPath($key): string
         return $this->cache_path.DIRECTORY_SEPARATOR.self::FILE_PREFIX.$key.self::FILE_EXTENSION;
     }
 
-    /**
-     * @return Generator|string[]
-     */
     private function listPaths(): Generator
     {
         $iterator = new FilesystemIterator(
             $this->cache_path,
             FilesystemIterator::CURRENT_AS_PATHNAME | FilesystemIterator::SKIP_DOTS
         );
 
+        /** @var string $path */
         foreach ($iterator as $path) {
             if (!is_dir($path)) {
                 yield $path;
@@ -310,7 +316,7 @@ private function listPaths(): Generator
      *
      * @throws CacheException
      */
-    private function validateKey($key)
+    private function validateKey($key): void
     {
         if (!is_string($key)) {
             throw new CacheException(sprintf('Expected key to be a string; received "%s"', is_object($key) ? get_class($key) : gettype($key)));
@@ -326,7 +332,7 @@ private function validateKey($key)
      *
      * @param string $path absolute directory path
      */
-    private function mkdir($path)
+    private function mkdir($path): void
     {
         $parent_path = dirname($path);