- Support Laravel 8

- Remove Laravel 5 & 6 support
- Remove PHP >7.2 support

Author: Torann

.gitignore

@@ -1,4 +1,6 @@
 /vendor
 composer.phar
 composer.lock
-.DS_Store
+.phpunit.result.cache
+.DS_Store
+.idea/*

.travis.yml

@@ -1,13 +1,14 @@
 language: php
 
 php:
-  - 5.6
-  - 7.1
   - 7.2
   - 7.3
+  - 7.4
 
 before_script:
   - curl -s http://getcomposer.org/installer | php
-  - php composer.phar install --dev
+  - php composer.phar install
 
-script: php ./vendor/bin/phpunit
+script:
+  - ./vendor/bin/phpcs --standard=phpcs.xml src
+  - ./vendor/bin/phpstan --level=0 --memory-limit=-1 --no-progress analyse src

README.md

@@ -1,4 +1,4 @@
-# Hashids for Laravel 5
+# Hashids for Laravel
 
 [![Latest Stable Version](https://poser.pugx.org/torann/hashids/v/stable.png)](https://packagist.org/packages/torann/hashids) [![Total Downloads](https://poser.pugx.org/torann/hashids/downloads.png)](https://packagist.org/packages/torann/hashids)
 
@@ -12,7 +12,6 @@ Generate hashes from numbers, like YouTube or Bitly. Use hashids when you do not
 
 - [Hashids on Packagist](https://packagist.org/packages/torann/hashids)
 - [Hashids on GitHub](https://github.com/torann/laravel-hashids)
-- [Laravel 4 Installation](#user-content-laravel-4-installation)
 
 ### Composer
 
@@ -22,41 +21,35 @@ From the command line run:
 $ composer require torann/hashids
 ```
 
-Once Hashids is installed you need to register the service provider with the application. Open up `config/app.php` and find the `providers` key.
+**Without Package Auto-Discovery**
+
+Once Hashids is installed you need to register the service provider and facade with the application. Open up `config/app.php` and find the `providers` and `aliases` keys.
 
 ```php
 'providers' => [
     Torann\Hashids\HashidsServiceProvider::class,
 ]
-```
 
-> There is no need to add the Facade, the package will add it for you.
+'aliases' => [
+    'Hashids' => Torann\Hashids\Facade\Hashids::class,
+]
+```
 
 ### Publish the configurations
 
 Run this on the command line from the root of your project:
 
-~~~
+```
 $ php artisan vendor:publish --provider="Torann\Hashids\HashidsServiceProvider"
-~~~
+```
 
 A configuration file will be publish to `config/hashids.php`.
 
-## Laravel 4 Installation
-
-Add verison 1.0 of Hashids in your `composer.json` file.
-
-~~~
-"torann/hashids": "1.0.*"
-~~~
-
-And following the directions in the [README](https://github.com/Torann/laravel-hashids/tree/1.0.0) on version 1.0.
-
 ## Usage
 
 Once you've followed all the steps and completed the installation you can use Hashids.
 
-### Encodeing
+### Encoding
 
 You can simply encode a single id:
 
@@ -70,7 +63,7 @@ or multiple..
 Hashids::encode(1, 21, 12, 12, 666); // Returns MMtaUpSGhdA
 ```
 
-### Decodeing
+### Decoding
 
 ```php
 Hashids::decode(Ri7Bi);
@@ -94,25 +87,4 @@ array (size=5)
 4 => int 666
 ```
 
-## Changelog
-
-**2.0.0**
-
-- Upgraded to Laravel 5
-- Upgraded to Hashids 1.0.5
-
-**1.0.0**
-
-- Several public functions are renamed to be more appropriate:
-	- Function `encrypt()` changed to `encode()`
-	- Function `decrypt()` changed to `decode()`
-	- Function `encryptHex()` changed to `encodeHex()`
-	- Function `decryptHex()` changed to `decodeHex()`
-
-	Hashids was designed to encode integers, primary ids at most. Hashids is the wrong algorithm to encrypt sensitive data. So to encourage more appropriate use, `encrypt/decrypt` is being "downgraded" to `encode/decode`.
-
-- Version tag added: `1.0`
-- `README.md` updated
-
-
 All credit for Hashids goes to Ivan Akimov (@ivanakimov), thanks to for making it!

composer.json

@@ -10,13 +10,29 @@
         }
     ],
     "require": {
-        "php": ">=5.6",
-        "illuminate/support": "~5.0|~6.0|~7.0",
-        "hashids/hashids": "1.0.6"
+        "php": "^7.2",
+        "illuminate/support": "~7.0|~8.0",
+        "hashids/hashids": "~4.0"
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^8.0",
+        "mockery/mockery": "^1.3",
+        "phpstan/phpstan": "^0.12.14",
+        "squizlabs/php_codesniffer": "^3.5"
     },
     "autoload": {
         "psr-4": {
           "Torann\\Hashids\\": "src/Torann/Hashids"
         }
+    },
+    "extra": {
+        "laravel": {
+            "providers": [
+                "Torann\\Hashids\\HashidsServiceProvider"
+            ],
+            "aliases": {
+                "Hashids": "Torann\\Hashids\\Facade\\Hashids"
+            }
+        }
     }
 }

phpcs.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<ruleset name="PSR2-package">
+    <description>The PSR2 standard</description>
+
+    <!-- use preg_match https://github.com/squizlabs/PHP_CodeSniffer/issues/742#issuecomment-215250517 -->
+    <exclude-pattern>/resources/</exclude-pattern>
+    <exclude-pattern>/vendor/</exclude-pattern>
+    <exclude-pattern>/_[a-zA-Z0-9\._]+\.php</exclude-pattern>
+    <exclude-pattern>/\.[a-zA-Z0-9\._]+\.php</exclude-pattern>
+    <exclude-pattern>\.git</exclude-pattern>
+
+    <!-- Include the whole PSR2 standard -->
+    <rule ref="PSR2">
+        <exclude name="PSR1.Methods.CamelCapsMethodName"/>
+        <exclude name="PSR2.Files.EndFileNewline"/>
+        <exclude name="PSR2.Methods.FunctionCallSignature.MultipleArguments"/>
+        <exclude name="Squiz.ControlStructures.ControlSignature.SpaceAfterCloseBrace"/>
+    </rule>
+
+    <!-- Lines can be longer -->
+    <rule ref="Generic.Files.LineLength">
+        <properties>
+            <property name="lineLimit" value="9999"/>
+        </properties>
+    </rule>
+</ruleset>

phpstan.neon

@@ -0,0 +1,6 @@
+parameters:
+    excludes_analyse:
+        - vendor
+        - resources
+    ignoreErrors:
+        - '#Function config_path not found#'

phpunit.xml

@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
 >
     <testsuites>
         <testsuite name="Package Test Suite">

src/Torann/Hashids/Facade.php renamed to src/Torann/Hashids/Facade/Hashids.php

@@ -1,15 +1,15 @@
 <?php
 
-namespace Torann\Hashids;
+namespace Torann\Hashids\Facade;
 
 use Illuminate\Support\Facades\Facade as IlluminateFacade;
 
-class Facade extends IlluminateFacade
+class Hashids extends IlluminateFacade
 {
     /**
-     * Get the registered component.
+     * Get the registered name of the component.
      *
-     * @return object
+     * @return string
      */
     protected static function getFacadeAccessor()
     {

src/Torann/Hashids/HashidsServiceProvider.php

@@ -1,10 +1,11 @@
-<?php namespace Torann\Hashids;
+<?php
+
+namespace Torann\Hashids;
 
 use Hashids\Hashids;
 use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 use Illuminate\Support\ServiceProvider;
-use Illuminate\Foundation\AliasLoader;
 
 class HashidsServiceProvider extends ServiceProvider
 {
@@ -19,9 +20,6 @@ public function boot()
             $this->publishes([
                 __DIR__ . '/../../config/hashids.php' => config_path('hashids.php'),
             ]);
-
-            // Add 'Assets' facade alias
-            AliasLoader::getInstance()->alias('Hashids', 'Torann\Hashids\Facade');
         }
     }