Merge pull request #18 from ElfSundae/update-packages

Update packages

.editorconfig

@@ -0,0 +1,15 @@
+root = true
+
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+indent_style = space
+indent_size = 4
+trim_trailing_whitespace = true
+
+[*.md]
+trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2

.gitattributes

@@ -2,15 +2,19 @@
 # https://www.kernel.org/pub/software/scm/git/docs/gitattributes.html
 
 # Ignore all test and documentation with "export-ignore".
-/tests              export-ignore
-/.editorconfig      export-ignore
-/.gitattributes     export-ignore
-/.gitignore         export-ignore
-/.php_cs            export-ignore
-/.php_cs.dist       export-ignore
-/.scrutinizer.yml   export-ignore
-/.sensiolabs.yml    export-ignore
-/.styleci.yml       export-ignore
-/.travis.yml        export-ignore
-/phpunit.xml        export-ignore
-/phpunit.xml.dist   export-ignore
+/.editorconfig              export-ignore
+/.gitattributes             export-ignore
+/.gitignore                 export-ignore
+/.php_cs                    export-ignore
+/.php_cs.dist               export-ignore
+/.scrutinizer.yml           export-ignore
+/.sensiolabs.yml            export-ignore
+/.styleci.yml               export-ignore
+/.travis.yml                export-ignore
+/docs                       export-ignore
+/ISSUE_TEMPLATE.md          export-ignore
+/phpcs.xml.dist             export-ignore
+/phpunit.xml                export-ignore
+/phpunit.xml.dist           export-ignore
+/PULL_REQUEST_TEMPLATE.md   export-ignore
+/tests                      export-ignore

.gitignore

@@ -1,4 +1,11 @@
+.DS_Store
+Thumbs.db
 /vendor
 /build
 composer.phar
 composer.lock
+.php_cs.cache
+/phpunit.xml
+.phpunit.result.cache
+/.idea
+/.vscode

.scrutinizer.yml

@@ -1,12 +1,13 @@
 build:
     nodes:
         analysis:
+            project_setup:
+                override: true
             tests:
                 override: [php-scrutinizer-run]
 
 filter:
-    excluded_paths:
-        - "tests/"
+    excluded_paths: [tests/*]
 
 checks:
     php:
@@ -26,5 +27,5 @@ checks:
 
 tools:
     external_code_coverage:
-        timeout: 1200
+        timeout: 600
         runs: 4

.travis.yml

@@ -2,32 +2,33 @@ dist: trusty
 language: php
 
 php:
-  - 5.6
-  - 7.0
   - 7.1
   - 7.2
-  - hhvm
+  - 7.3
 
+# This triggers builds to run on the new TravisCI infrastructure.
+# See: http://docs.travis-ci.com/user/workers/container-based-infrastructure/
 sudo: false
 
+## Cache composer
 cache:
   directories:
     - $HOME/.composer/cache
 
 matrix:
   include:
-    - php: 5.6
-      env: 'COMPOSER_FLAGS="--prefer-lowest --prefer-stable"'
+    - php: 7.1
+      env: 'COMPOSER_FLAGS="--prefer-stable --prefer-lowest"'
 
 before_script:
-  - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist --no-suggest
+  - travis_retry composer update ${COMPOSER_FLAGS} --no-interaction --prefer-dist
 
 script:
   - vendor/bin/phpunit --coverage-text --coverage-clover=coverage.clover
 
 after_script:
   - |
-    if [[ "$TRAVIS_PHP_VERSION" != 'hhvm' && "$TRAVIS_PHP_VERSION" != '7.0' ]]; then
+    if [[ "$TRAVIS_PHP_VERSION" != 'hhvm' ]]; then
       wget https://scrutinizer-ci.com/ocular.phar
       php ocular.phar code-coverage:upload --format=php-clover coverage.clover
     fi

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Release Notes
 
+## unreleased
+
+- Removed PHP 5 support
+- Added support for Laravel 5.7 and 5.8
+- Added support for `tuupola/base62` 2.x
+- Added support for `hashids/hashids` 3.x
+- Added support for `jenssegers/optimus` 1.x
+
 ## 1.2.0 (2018-02-04)
 
 - Support Laravel 5.6

composer.json

@@ -13,18 +13,18 @@
         }
     ],
     "require": {
-        "php": ">=5.6.4",
-        "illuminate/support": "~5.0,<5.7",
-        "illuminate/console": "~5.0,<5.7",
-        "tuupola/base62": "~0.9",
+        "php": "~7.1",
+        "illuminate/support": "~5.0,<5.9",
+        "illuminate/console": "~5.0,<5.9",
+        "tuupola/base62": "~2.0",
         "elfsundae/urlsafe-base64": "~1.1",
-        "hashids/hashids": "^2.0.4",
-        "jenssegers/optimus": "^0.2.3",
+        "hashids/hashids": "^2.0.4|~3.0",
+        "jenssegers/optimus": "~1.0",
         "phpseclib/phpseclib": "~2.0"
     },
     "require-dev": {
         "mockery/mockery": "~1.0",
-        "phpunit/phpunit": "~5.7|~6.0|~7.0",
+        "phpunit/phpunit": "~5.7|~6.0|~7.0|~8.0",
         "orchestra/testbench": "~3.0",
         "paragonie/random_compat": "~1.0|~2.0"
     },

phpunit.xml.dist

@@ -20,9 +20,8 @@
         </whitelist>
     </filter>
     <logging>
-        <log type="tap" target="build/report.tap"/>
         <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/logs/clover.xml"/>
     </logging>

src/Base62Driver.php

@@ -15,13 +15,6 @@ class Base62Driver implements DriverInterface
      */
     protected $base62;
 
-    /**
-     * Indicates integer encoding.
-     *
-     * @var bool
-     */
-    protected $integer = false;
-
     /**
      * Create a new Base62 driver instance.
      *
@@ -38,22 +31,22 @@ public function __construct(array $config = [])
     /**
      * Encode the data.
      *
-     * @param  mixed  $data
+     * @param  string  $data
      * @return string
      */
     public function encode($data)
     {
-        return $this->base62->encode($data, $this->integer);
+        return $this->base62->encode($data);
     }
 
     /**
      * Decode the data.
      *
-     * @param  mixed  $data
-     * @return mixed
+     * @param  string  $data
+     * @return string
      */
     public function decode($data)
     {
-        return $this->base62->decode($data, $this->integer);
+        return $this->base62->decode($data);
     }
 }

src/Base62IntegerDriver.php

@@ -5,9 +5,24 @@
 class Base62IntegerDriver extends Base62Driver
 {
     /**
-     * Indicates integer encoding.
+     * Encode the data.
      *
-     * @var bool
+     * @param  int  $data
+     * @return string
      */
-    protected $integer = true;
+    public function encode($data)
+    {
+        return $this->base62->encodeInteger($data);
+    }
+
+    /**
+     * Decode the data.
+     *
+     * @param  string  $data
+     * @return int
+     */
+    public function decode($data)
+    {
+        return $this->base62->decodeInteger($data);
+    }
 }

tests/Base62DriverTest.php

@@ -19,8 +19,7 @@ public function testInstantiation()
     public function testEncoding()
     {
         $this->assertEncodedData('Hashid', 'Mb6pKATc');
-        $this->runForRandomBytes();
-        $this->runForLeadingZeroBytes();
+        $this->runForBytes();
         $this->assertUniformEncoding(random_bytes(128));
 
         $this->assertEncodedData(987654321, '14q60P', $this->integerDriver);
@@ -33,8 +32,7 @@ public function testEncodingWithCustomCharacters()
         $config = [
             'characters' => str_shuffle('0123456789abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ'),
         ];
-        $this->runForRandomBytes($config);
-        $this->runForLeadingZeroBytes($config);
+        $this->runForBytes();
         $this->assertUniformEncoding(random_bytes(128), $config);
         $this->runForIntegers($this->integerDriver, $config);
         $this->assertUniformEncoding(random_int(0, PHP_INT_MAX), $this->integerDriver, $config);

tests/OptimusDriverTest.php

@@ -10,7 +10,7 @@ class OptimusDriverTest extends DriverTestCase
 {
     protected $driver = OptimusDriver::class;
 
-    protected $maxInteger = Optimus::MAX_INT;
+    protected $maxInteger = 2 ** Optimus::DEFAULT_SIZE - 1;
 
     public function testInstantiation()
     {