From 5dc0874c7adfce538250d7947d160cfcd55be68d Mon Sep 17 00:00:00 2001 From: Bruno Meilick Date: Sat, 22 Dec 2018 17:21:59 +0100 Subject: [PATCH] kirby3 rc-2 Signed-off-by: Bruno Meilick --- .gitignore | 1 + .php_cs.dist | 1 + composer.json | 55 ++++++++++----- composer.lock | 190 +++++++++++++++++--------------------------------- 4 files changed, 105 insertions(+), 142 deletions(-) diff --git a/.gitignore b/.gitignore index 33a0770..a187000 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ vendor/ /kirby3-fingerprint.zip +/kirby \ No newline at end of file diff --git a/.php_cs.dist b/.php_cs.dist index b6269a1..625dc3c 100644 --- a/.php_cs.dist +++ b/.php_cs.dist @@ -2,6 +2,7 @@ $finder = PhpCsFixer\Finder::create() ->exclude('vendor') + ->exclude('kirby') ->in(__DIR__) ; diff --git a/composer.json b/composer.json index ab0f9b3..e13adb4 100644 --- a/composer.json +++ b/composer.json @@ -1,9 +1,26 @@ { "name": "bnomei/kirby3-fingerprint", "type": "plugin", - "version": "2.2.1", + "version": "2.2.2", "description": "File Method and css/js helper to add cachbusting hash and optional Subresource Integrity to file", "license": "MIT", + "authors": [ + { + "name": "Bruno Meilick", + "email": "b@bnomei.com" + } + ], + "keywords": [ + "kirby3", + "kirby3-cms", + "kirby3-plugin", + "fingerprint", + "hash", + "cache-buster", + "subresource-integrity" + ], + "suggest": { + }, "autoload": { "files": [ "config.php" @@ -12,27 +29,31 @@ "Bnomei\\": "classes/" } }, - "authors": [ - { - "name": "Bruno Meilick", - "email": "b@bnomei.com" - } - ], + "config": { + "optimize-autoloader": true, + "sort-packages": true + }, "repositories": [ { - "type": "vcs", - "url": "https://github.com/k-next/kirby" + "type": "vcs", + "url": "https://github.com/k-next/kirby" } - ], + ], "require": { - "getkirby/cms": "dev-master as 3.0.0" + "php": ">=7.1.0", + "getkirby/cms": "^3.0.0-RC-2.0" }, - "require-dev" : { + "conflict": { + "getkirby/kirby": "<3.0" }, "scripts": { - "build": "composer update; composer dumpautoload -o;", - "dev-zip": "rm kirby3-fingerprint.zip; composer remove getkirby/cms; composer dumpautoload -o; composer archive --format=zip --file=kirby3-fingerprint; composer require getkirby/cms:'dev-master as 3.0.0'; composer dumpautoload -o;", - "zip": "rm kirby3-fingerprint.zip; composer update; composer remove getkirby/cms; composer dumpautoload -o; zip -r kirby3-fingerprint.zip . -x *.git*; composer require getkirby/cms:'dev-master as 3.0.0'; composer dumpautoload -o;" - }, - "minimum-stability": "beta" + "zip": [ + "rm kirby3-fingerprint.zip", + "composer install --no-dev", + "composer remove getkirby/cms", + "composer dumpautoload -o", + "zip -r kirby3-fingerprint.zip . -x *.git*", + "composer require getkirby/cms:'^3.0.0-RC-2.0'" + ] + } } diff --git a/composer.lock b/composer.lock index dca1fef..a414d40 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "1be7625d25e22cc1ab0b60d38322eccd", + "content-hash": "084f657584e8341f86ebe4ad5606244e", "packages": [ { "name": "claviska/simpleimage", @@ -45,114 +45,18 @@ "description": "A PHP class that makes working with images as simple as possible.", "time": "2017-09-12T09:03:56+00:00" }, - { - "name": "erusev/parsedown", - "version": "1.8.0-beta-5", - "source": { - "type": "git", - "url": "https://github.com/erusev/parsedown.git", - "reference": "c26a2ee4bf8ba0270daab7da0353f2525ca6564a" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/c26a2ee4bf8ba0270daab7da0353f2525ca6564a", - "reference": "c26a2ee4bf8ba0270daab7da0353f2525ca6564a", - "shasum": "" - }, - "require": { - "ext-mbstring": "*", - "php": ">=5.3.0" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35" - }, - "type": "library", - "autoload": { - "psr-0": { - "Parsedown": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Emanuil Rusev", - "email": "hello@erusev.com", - "homepage": "http://erusev.com" - } - ], - "description": "Parser for Markdown.", - "homepage": "http://parsedown.org", - "keywords": [ - "markdown", - "parser" - ], - "time": "2018-06-11T18:15:32+00:00" - }, - { - "name": "erusev/parsedown-extra", - "version": "0.8.0-beta-1", - "source": { - "type": "git", - "url": "https://github.com/erusev/parsedown-extra.git", - "reference": "e756b1bf8642ab1091403e902b0503f1cec7527d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown-extra/zipball/e756b1bf8642ab1091403e902b0503f1cec7527d", - "reference": "e756b1bf8642ab1091403e902b0503f1cec7527d", - "shasum": "" - }, - "require": { - "erusev/parsedown": "^1.8.0|^1.8.0-beta-4", - "ext-dom": "*", - "ext-mbstring": "*", - "php": ">=5.3.6" - }, - "require-dev": { - "phpunit/phpunit": "^4.8.35" - }, - "type": "library", - "autoload": { - "psr-0": { - "ParsedownExtra": "" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Emanuil Rusev", - "email": "hello@erusev.com", - "homepage": "http://erusev.com" - } - ], - "description": "An extension of Parsedown that adds support for Markdown Extra.", - "homepage": "https://github.com/erusev/parsedown-extra", - "keywords": [ - "markdown", - "markdown extra", - "parsedown", - "parser" - ], - "time": "2018-05-08T21:54:32+00:00" - }, { "name": "filp/whoops", - "version": "2.2.1", + "version": "2.3.1", "source": { "type": "git", "url": "https://github.com/filp/whoops.git", - "reference": "e79cd403fb77fc8963a99ecc30e80ddd885b3311" + "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/filp/whoops/zipball/e79cd403fb77fc8963a99ecc30e80ddd885b3311", - "reference": "e79cd403fb77fc8963a99ecc30e80ddd885b3311", + "url": "https://api.github.com/repos/filp/whoops/zipball/bc0fd11bc455cc20ee4b5edabc63ebbf859324c7", + "reference": "bc0fd11bc455cc20ee4b5edabc63ebbf859324c7", "shasum": "" }, "require": { @@ -200,20 +104,20 @@ "throwable", "whoops" ], - "time": "2018-06-30T13:14:06+00:00" + "time": "2018-10-23T09:00:00+00:00" }, { "name": "getkirby/cms", - "version": "dev-master", + "version": "3.0.0-RC-2.0", "source": { "type": "git", "url": "https://github.com/k-next/kirby.git", - "reference": "204227a3d81a5099febc1735fd2777faa6274b61" + "reference": "0d24600687e74ed74a9005e80d8ac740400c420b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/k-next/kirby/zipball/204227a3d81a5099febc1735fd2777faa6274b61", - "reference": "204227a3d81a5099febc1735fd2777faa6274b61", + "url": "https://api.github.com/repos/k-next/kirby/zipball/0d24600687e74ed74a9005e80d8ac740400c420b", + "reference": "0d24600687e74ed74a9005e80d8ac740400c420b", "shasum": "" }, "archive": { @@ -248,26 +152,29 @@ }, "require": { "claviska/simpleimage": "3.3.*", - "erusev/parsedown-extra": "0.8.*", "ext-mbstring": "*", - "filp/whoops": "2.2.*", + "filp/whoops": "2.3.*", + "getkirby/composer-installer": "*", "michelf/php-smartypants": "1.8.*", "mustangostang/spyc": "0.6.*", "php": ">=7.1.0", "phpmailer/phpmailer": "6.0.*", "true/punycode": "2.1.*", - "zendframework/zend-escaper": "^2.6" + "zendframework/zend-escaper": "2.6.*" }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.11.1", "phpunit/phpunit": "^6.0" }, - "type": "library", + "type": "kirby-cms", "autoload": { "files": [ "config/helpers.php", "config/aliases.php" ], + "psr-0": { + "Parsedown": "dependencies/" + }, "psr-4": { "Kirby\\": "src/" } @@ -288,13 +195,13 @@ "./scripts/build" ], "fix": [ - "./vendor/bin/php-cs-fixer fix ./src/" + "./vendor/bin/php-cs-fixer fix ." ] }, "authors": [ { - "name": "Bastian Allgeier", - "email": "bastian@getkirby.com", + "name": "Kirby Team", + "email": "support@getkirby.com", "homepage": "https://getkirby.com" } ], @@ -310,7 +217,45 @@ "forum": "https://forum.getkirby.com", "source": "https://github.com/getkirby/kirby" }, - "time": "2018-11-29T16:53:20+00:00" + "time": "2018-12-21T11:50:32+00:00" + }, + { + "name": "getkirby/composer-installer", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/k-next/composer-installer.git", + "reference": "dc0e38c4f0fc04875c1a523d82364a44f436cbf4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/k-next/composer-installer/zipball/dc0e38c4f0fc04875c1a523d82364a44f436cbf4", + "reference": "dc0e38c4f0fc04875c1a523d82364a44f436cbf4", + "shasum": "" + }, + "require": { + "composer-plugin-api": "^1.0" + }, + "require-dev": { + "composer/composer": "^1.3", + "phpunit/phpunit": "^6.0" + }, + "type": "composer-plugin", + "extra": { + "class": "Kirby\\ComposerInstaller\\Plugin" + }, + "autoload": { + "psr-4": { + "Kirby\\ComposerInstaller\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "description": "Kirby's custom Composer installer for the Kirby CMS", + "homepage": "https://getkirby.com", + "time": "2018-12-19T10:01:45+00:00" }, { "name": "league/color-extractor", @@ -731,20 +676,15 @@ } ], "packages-dev": [], - "aliases": [ - { - "alias": "3.0.0", - "alias_normalized": "3.0.0.0", - "version": "9999999-dev", - "package": "getkirby/cms" - } - ], - "minimum-stability": "beta", + "aliases": [], + "minimum-stability": "stable", "stability-flags": { - "getkirby/cms": 20 + "getkirby/cms": 5 }, "prefer-stable": false, "prefer-lowest": false, - "platform": [], + "platform": { + "php": ">=7.1.0" + }, "platform-dev": [] }