From 7af92c71f83988b52324003ff37dba0ae8e6e722 Mon Sep 17 00:00:00 2001 From: Cees-Jan Kiewiet Date: Mon, 19 Jun 2017 16:19:58 +0200 Subject: [PATCH 1/2] Use package instead of our own autoloader --- composer.json | 8 +++----- composer.lock | 42 ++++++++++++++++++++++++++++++++++++++++-- src/bootstrap.php | 7 ------- 3 files changed, 43 insertions(+), 14 deletions(-) delete mode 100644 src/bootstrap.php diff --git a/composer.json b/composer.json index 4d1dc8a..1a4fc6f 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,8 @@ "php": "^7.0", "doctrine/annotations": "^1.4", "psr/http-message": "^1.0", - "react/promise": "^2.4" + "react/promise": "^2.4", + "wyrihaximus/doctrine-annotation-autoloader": "dev-master" }, "require-dev": { "api-clients/test-utilities": "^4.1", @@ -31,10 +32,7 @@ "autoload": { "psr-4": { "ApiClients\\Foundation\\Middleware\\": "src/" - }, - "files": [ - "src/bootstrap.php" - ] + } }, "autoload-dev": { "psr-4": { diff --git a/composer.lock b/composer.lock index 2894def..fddd90c 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "d2e31ee763fbb9a82426fd3ee9b9cce5", + "content-hash": "df734221de89c3196c4a6b6f9f3bd955", "packages": [ { "name": "doctrine/annotations", @@ -223,6 +223,42 @@ "promises" ], "time": "2017-03-25T12:08:31+00:00" + }, + { + "name": "wyrihaximus/doctrine-annotation-autoloader", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/WyriHaximus/php-doctrine-annotation-autoloader.git", + "reference": "335d62f68953428c1637a45615d8f4aebe9479b5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/WyriHaximus/php-doctrine-annotation-autoloader/zipball/335d62f68953428c1637a45615d8f4aebe9479b5", + "reference": "335d62f68953428c1637a45615d8f4aebe9479b5", + "shasum": "" + }, + "require": { + "doctrine/annotations": "^1.4" + }, + "type": "library", + "autoload": { + "files": [ + "src/bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Cees-Jan Kiewiet", + "email": "ceesjank@gmail.com" + } + ], + "description": "Request middleware", + "time": "2017-06-19 14:08:21" } ], "packages-dev": [ @@ -2888,7 +2924,9 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": [], + "stability-flags": { + "wyrihaximus/doctrine-annotation-autoloader": 20 + }, "prefer-stable": true, "prefer-lowest": false, "platform": { diff --git a/src/bootstrap.php b/src/bootstrap.php deleted file mode 100644 index cdec6d0..0000000 --- a/src/bootstrap.php +++ /dev/null @@ -1,7 +0,0 @@ - Date: Mon, 19 Jun 2017 17:05:39 +0200 Subject: [PATCH 2/2] Updated to tagged wyrihaximus/doctrine-annotation-autoloader --- composer.json | 2 +- composer.lock | 16 +++++++--------- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/composer.json b/composer.json index 1a4fc6f..7484463 100644 --- a/composer.json +++ b/composer.json @@ -15,7 +15,7 @@ "doctrine/annotations": "^1.4", "psr/http-message": "^1.0", "react/promise": "^2.4", - "wyrihaximus/doctrine-annotation-autoloader": "dev-master" + "wyrihaximus/doctrine-annotation-autoloader": "^1.0" }, "require-dev": { "api-clients/test-utilities": "^4.1", diff --git a/composer.lock b/composer.lock index fddd90c..cb76114 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "df734221de89c3196c4a6b6f9f3bd955", + "content-hash": "2ad7e5abec8e0dbb0f6bbba5ab9dcb71", "packages": [ { "name": "doctrine/annotations", @@ -226,16 +226,16 @@ }, { "name": "wyrihaximus/doctrine-annotation-autoloader", - "version": "dev-master", + "version": "1.0.0", "source": { "type": "git", "url": "https://github.com/WyriHaximus/php-doctrine-annotation-autoloader.git", - "reference": "335d62f68953428c1637a45615d8f4aebe9479b5" + "reference": "9670f84b7d3ca53723556988080ebc939da345af" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/WyriHaximus/php-doctrine-annotation-autoloader/zipball/335d62f68953428c1637a45615d8f4aebe9479b5", - "reference": "335d62f68953428c1637a45615d8f4aebe9479b5", + "url": "https://api.github.com/repos/WyriHaximus/php-doctrine-annotation-autoloader/zipball/9670f84b7d3ca53723556988080ebc939da345af", + "reference": "9670f84b7d3ca53723556988080ebc939da345af", "shasum": "" }, "require": { @@ -258,7 +258,7 @@ } ], "description": "Request middleware", - "time": "2017-06-19 14:08:21" + "time": "2017-06-19T15:02:15+00:00" } ], "packages-dev": [ @@ -2924,9 +2924,7 @@ ], "aliases": [], "minimum-stability": "dev", - "stability-flags": { - "wyrihaximus/doctrine-annotation-autoloader": 20 - }, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": {