From 00b08b92ab1ba9123dbed14f498cc78787eab3f5 Mon Sep 17 00:00:00 2001 From: Alwin Drenth Date: Mon, 20 Apr 2020 13:51:24 +0200 Subject: [PATCH 01/11] Update PHP version constraint --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index fe71561..6462e6b 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": ">=7.1", + "php": "^7.1", "hashids/hashids": "^3.0" }, "archive": { From 9751a010359c70acec4c5b88f8663b5dfa1579bc Mon Sep 17 00:00:00 2001 From: Alwin Drenth Date: Mon, 20 Apr 2020 13:51:30 +0200 Subject: [PATCH 02/11] Update README --- README.md | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9d6c7cc..d4befdc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,22 @@ -# Vdlp.Hashids - -Hashids is a small open-source library that generates short, unique, non-sequential ids from numbers. +

+ +

Vdlp.Hashids

+

+ +

+ Allows developers to use secure hashed ID's. +

+ +

+ + + + + + +

+ +Fetches RSS/Atom feeds to put on your website. It can be automated using a cronjob or triggered manually. It converts numbers like 347 into strings like "yr8", or array of numbers like [27, 986] into "3kTMd". From 5be01f44f7d1850236ae6b0341e5790981f1518b Mon Sep 17 00:00:00 2001 From: Alwin Drenth Date: Mon, 20 Apr 2020 13:57:10 +0200 Subject: [PATCH 03/11] Update latest version in README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index d4befdc..1ad292c 100644 --- a/README.md +++ b/README.md @@ -10,7 +10,7 @@

- + From 2d2964cd6e572011434d77c1377fd40b90a60f97 Mon Sep 17 00:00:00 2001 From: Alwin Drenth Date: Tue, 1 Sep 2020 11:16:53 +0200 Subject: [PATCH 04/11] Create dependabot.yml --- .github/dependabot.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .github/dependabot.yml diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..a839255 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,11 @@ +# To get started with Dependabot version updates, you'll need to specify which +# package ecosystems to update and where the package manifests are located. +# Please see the documentation for all configuration options: +# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates + +version: 2 +updates: + - package-ecosystem: "composer" + directory: "/" + schedule: + interval: "daily" From 8c5e9af3dfc70d5b9649b2c204926ef3a5728da0 Mon Sep 17 00:00:00 2001 From: Alwin Drenth Date: Tue, 1 Sep 2020 11:17:19 +0200 Subject: [PATCH 05/11] Create php.yml --- .github/workflows/php.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/php.yml diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml new file mode 100644 index 0000000..e5a21f6 --- /dev/null +++ b/.github/workflows/php.yml @@ -0,0 +1,37 @@ +name: PHP Composer + +on: + push: + branches: [ develop ] + pull_request: + branches: [ develop ] + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + + - name: Validate composer.json and composer.lock + run: composer validate + + - name: Cache Composer packages + id: composer-cache + uses: actions/cache@v2 + with: + path: vendor + key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }} + restore-keys: | + ${{ runner.os }}-php- + + - name: Install dependencies + if: steps.composer-cache.outputs.cache-hit != 'true' + run: composer install --prefer-dist --no-progress --no-suggest + + # Add a test script to composer.json, for instance: "test": "vendor/bin/phpunit" + # Docs: https://getcomposer.org/doc/articles/scripts.md + + # - name: Run test suite + # run: composer run-script test From fceefe1472e362b8ba5e473e23fc2a025fe2d7bf Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 1 Sep 2020 09:17:20 +0000 Subject: [PATCH 06/11] Update hashids/hashids requirement from ^3.0 to ^4.0 Updates the requirements on [hashids/hashids](https://github.com/vinkla/hashids) to permit the latest version. - [Release notes](https://github.com/vinkla/hashids/releases) - [Changelog](https://github.com/vinkla/hashids/blob/master/CHANGELOG.md) - [Commits](https://github.com/vinkla/hashids/compare/3.0.0...4.0.0) Signed-off-by: dependabot[bot] --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6462e6b..6ac733f 100644 --- a/composer.json +++ b/composer.json @@ -11,7 +11,7 @@ ], "require": { "php": "^7.1", - "hashids/hashids": "^3.0" + "hashids/hashids": "^4.0" }, "archive": { "exclude": [ From 7191215622c1711c29acff15174752b5e0d5ef3f Mon Sep 17 00:00:00 2001 From: Alwin Drenth Date: Tue, 1 Sep 2020 11:38:21 +0200 Subject: [PATCH 07/11] Change license identifier to GPL-2.0-only: License "GPL-2.0" is a deprecated SPDX license identifier, use "GPL-2.0-only" or "GPL-2.0-or-later" instead --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 6ac733f..3521bed 100644 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "vdlp/oc-hashids-plugin", "description": "Allows developers to use secure hashed ID's in October CMS powered websites.", "type": "october-plugin", - "license": "GPL-2.0", + "license": "GPL-2.0-only", "authors": [ { "name": "Van der Let & Partners", From 0a178511574fdf2df92a01926b3a64d591ba21e1 Mon Sep 17 00:00:00 2001 From: Alwin Drenth Date: Tue, 1 Sep 2020 11:41:29 +0200 Subject: [PATCH 08/11] Drop support for PHP 7.1 --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 3521bed..b7c5d4b 100644 --- a/composer.json +++ b/composer.json @@ -10,7 +10,7 @@ } ], "require": { - "php": "^7.1", + "php": "^7.2", "hashids/hashids": "^4.0" }, "archive": { From acf457a1b09e5e7670fc55ab47cc276b616ca966 Mon Sep 17 00:00:00 2001 From: Alwin Drenth Date: Tue, 1 Sep 2020 11:41:38 +0200 Subject: [PATCH 09/11] Remove unnecessary code documentation --- ServiceProvider.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/ServiceProvider.php b/ServiceProvider.php index 4ede677..5861955 100644 --- a/ServiceProvider.php +++ b/ServiceProvider.php @@ -12,9 +12,6 @@ class ServiceProvider extends BaseServiceProvider { - /** - * @return void - */ public function boot(): void { $this->publishes([ @@ -24,9 +21,6 @@ public function boot(): void $this->mergeConfigFrom(__DIR__ . '/config.php', 'hashids'); } - /** - * @return void - */ public function register(): void { $this->app->singleton(HashidsFactory::class, static function (): HashidsFactory { From 6082000c379429ecb924f523794f2074f2802676 Mon Sep 17 00:00:00 2001 From: Alwin Drenth Date: Tue, 1 Sep 2020 11:42:02 +0200 Subject: [PATCH 10/11] Update requirements in README --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 1ad292c..e4edb86 100644 --- a/README.md +++ b/README.md @@ -11,9 +11,9 @@ - +

Fetches RSS/Atom feeds to put on your website. It can be automated using a cronjob or triggered manually. @@ -24,8 +24,8 @@ You can also decode those ids back. This is useful in bundling several parameter ## Requirements -* PHP 7.1 or higher -* Preferably one of the latest October CMS build +* PHP 7.2 or higher +* October CMS build 468 or higher ## Installation @@ -44,7 +44,7 @@ Go to Settings > Updates & Plugins > Install plugins and search for 'Hashids'. To configure this plugin execute the following command: ``` -php artisan vendor:publish --provider="Vdlp\Hashids\ServiceProviders\HashidsServiceProvider" --tag="config" +php artisan vendor:publish --provider="Vdlp\Hashids\ServiceProvider" --tag="config" ``` This will create a `config/hashids.php` file in your app where you can modify the configuration. From 26a06a3a6d89bd38d1fec34335df66d573aa87fd Mon Sep 17 00:00:00 2001 From: Alwin Drenth Date: Tue, 1 Sep 2020 11:42:11 +0200 Subject: [PATCH 11/11] Bump version to 2.0.0 --- updates/version.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/updates/version.yaml b/updates/version.yaml index 9220207..2140e52 100644 --- a/updates/version.yaml +++ b/updates/version.yaml @@ -3,3 +3,4 @@ 1.1.0: - Code optimizations - Moved service provider +2.0.0: Drop PHP 7.1 support