From 3204a6eadcc9cbef2710226cbb47a25a10dc4328 Mon Sep 17 00:00:00 2001 From: Abinav Dhiman Date: Mon, 4 Jan 2021 13:59:58 +0000 Subject: [PATCH 1/3] Removed Deprecated Packages to support PHP 8 --- composer.json | 5 +- composer.lock | 1150 +++++++++++++++----- tests/ImageKit/File/FileTest.php | 23 +- tests/ImageKit/Signature/SignatureTest.php | 2 +- tests/ImageKit/Upload/UploadTest.php | 52 +- tests/ImageKit/Url/UrlTest.php | 142 ++- 6 files changed, 991 insertions(+), 383 deletions(-) diff --git a/composer.json b/composer.json index 2f6254c..eb33bcb 100644 --- a/composer.json +++ b/composer.json @@ -20,14 +20,13 @@ ], "license": "MIT", "require": { - "php":"^5.3.3 || ^7.0", - "fzaninotto/faker": "^1.9", + "php":"^5.3.3 || ^7.0 || ^8.0", "ext-curl": "*", "guzzlehttp/guzzle": "~6.0", "ext-json": "*" }, "require-dev": { - "phpunit/phpunit": "^7", + "phpunit/phpunit": "^9", "ext-json": "*" }, "autoload": { diff --git a/composer.lock b/composer.lock index 6b84fd6..3ffabec 100644 --- a/composer.lock +++ b/composer.lock @@ -4,59 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "aac7324283062310328839f18df2b37a", + "content-hash": "f6fe0f7dade757482705ee4f343443f1", "packages": [ - { - "name": "fzaninotto/faker", - "version": "v1.9.2", - "source": { - "type": "git", - "url": "https://github.com/fzaninotto/Faker.git", - "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/848d8125239d7dbf8ab25cb7f054f1a630e68c2e", - "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0" - }, - "require-dev": { - "ext-intl": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7", - "squizlabs/php_codesniffer": "^2.9.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9-dev" - } - }, - "autoload": { - "psr-4": { - "Faker\\": "src/Faker/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "François Zaninotto" - } - ], - "description": "Faker is a PHP library that generates fake data for you.", - "keywords": [ - "data", - "faker", - "fixtures" - ], - "abandoned": true, - "time": "2020-12-11T09:56:16+00:00" - }, { "name": "guzzlehttp/guzzle", "version": "6.5.5", @@ -122,6 +71,10 @@ "rest", "web service" ], + "support": { + "issues": "https://github.com/guzzle/guzzle/issues", + "source": "https://github.com/guzzle/guzzle/tree/6.5" + }, "time": "2020-06-16T21:01:06+00:00" }, { @@ -173,6 +126,10 @@ "keywords": [ "promise" ], + "support": { + "issues": "https://github.com/guzzle/promises/issues", + "source": "https://github.com/guzzle/promises/tree/1.4.0" + }, "time": "2020-09-30T07:37:28+00:00" }, { @@ -244,6 +201,10 @@ "uri", "url" ], + "support": { + "issues": "https://github.com/guzzle/psr7/issues", + "source": "https://github.com/guzzle/psr7/tree/1.7.0" + }, "time": "2020-09-30T07:37:11+00:00" }, { @@ -294,6 +255,9 @@ "request", "response" ], + "support": { + "source": "https://github.com/php-fig/http-message/tree/master" + }, "time": "2016-08-06T14:39:51+00:00" }, { @@ -334,6 +298,10 @@ } ], "description": "A polyfill for getallheaders.", + "support": { + "issues": "https://github.com/ralouphie/getallheaders/issues", + "source": "https://github.com/ralouphie/getallheaders/tree/develop" + }, "time": "2019-03-08T08:55:37+00:00" }, { @@ -404,6 +372,23 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.20.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-10-23T14:02:19+00:00" }, { @@ -471,6 +456,23 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.20.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-10-23T14:02:19+00:00" }, { @@ -530,6 +532,23 @@ "portable", "shim" ], + "support": { + "source": "https://github.com/symfony/polyfill-php72/tree/v1.20.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-10-23T14:02:19+00:00" } ], @@ -583,6 +602,24 @@ "constructor", "instantiate" ], + "support": { + "issues": "https://github.com/doctrine/instantiator/issues", + "source": "https://github.com/doctrine/instantiator/tree/1.4.0" + }, + "funding": [ + { + "url": "https://www.doctrine-project.org/sponsorship.html", + "type": "custom" + }, + { + "url": "https://www.patreon.com/phpdoctrine", + "type": "patreon" + }, + { + "url": "https://tidelift.com/funding/github/packagist/doctrine%2Finstantiator", + "type": "tidelift" + } + ], "time": "2020-11-10T18:47:58+00:00" }, { @@ -631,32 +668,99 @@ "object", "object graph" ], + "support": { + "issues": "https://github.com/myclabs/DeepCopy/issues", + "source": "https://github.com/myclabs/DeepCopy/tree/1.10.2" + }, + "funding": [ + { + "url": "https://tidelift.com/funding/github/packagist/myclabs/deep-copy", + "type": "tidelift" + } + ], "time": "2020-11-13T09:40:50+00:00" }, + { + "name": "nikic/php-parser", + "version": "v4.10.4", + "source": { + "type": "git", + "url": "https://github.com/nikic/PHP-Parser.git", + "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/c6d052fc58cb876152f89f532b95a8d7907e7f0e", + "reference": "c6d052fc58cb876152f89f532b95a8d7907e7f0e", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=7.0" + }, + "require-dev": { + "ircmaxell/php-yacc": "^0.0.7", + "phpunit/phpunit": "^6.5 || ^7.0 || ^8.0 || ^9.0" + }, + "bin": [ + "bin/php-parse" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.9-dev" + } + }, + "autoload": { + "psr-4": { + "PhpParser\\": "lib/PhpParser" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Nikita Popov" + } + ], + "description": "A PHP parser written in PHP", + "keywords": [ + "parser", + "php" + ], + "support": { + "issues": "https://github.com/nikic/PHP-Parser/issues", + "source": "https://github.com/nikic/PHP-Parser/tree/v4.10.4" + }, + "time": "2020-12-20T10:01:03+00:00" + }, { "name": "phar-io/manifest", - "version": "1.0.3", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4" + "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", - "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/85265efd3af7ba3ca4b2a2c34dbfc5788dd29133", + "reference": "85265efd3af7ba3ca4b2a2c34dbfc5788dd29133", "shasum": "" }, "require": { "ext-dom": "*", "ext-phar": "*", - "phar-io/version": "^2.0", - "php": "^5.6 || ^7.0" + "ext-xmlwriter": "*", + "phar-io/version": "^3.0.1", + "php": "^7.2 || ^8.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -686,24 +790,28 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "time": "2018-07-08T19:23:20+00:00" + "support": { + "issues": "https://github.com/phar-io/manifest/issues", + "source": "https://github.com/phar-io/manifest/tree/master" + }, + "time": "2020-06-27T14:33:11+00:00" }, { "name": "phar-io/version", - "version": "2.0.1", + "version": "3.0.4", "source": { "type": "git", "url": "https://github.com/phar-io/version.git", - "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6" + "reference": "e4782611070e50613683d2b9a57730e9a3ba5451" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6", - "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6", + "url": "https://api.github.com/repos/phar-io/version/zipball/e4782611070e50613683d2b9a57730e9a3ba5451", + "reference": "e4782611070e50613683d2b9a57730e9a3ba5451", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.2 || ^8.0" }, "type": "library", "autoload": { @@ -733,7 +841,11 @@ } ], "description": "Library for handling version information and constraints", - "time": "2018-07-08T19:19:57+00:00" + "support": { + "issues": "https://github.com/phar-io/version/issues", + "source": "https://github.com/phar-io/version/tree/3.0.4" + }, + "time": "2020-12-13T23:18:30+00:00" }, { "name": "phpdocumentor/reflection-common", @@ -782,6 +894,10 @@ "reflection", "static analysis" ], + "support": { + "issues": "https://github.com/phpDocumentor/ReflectionCommon/issues", + "source": "https://github.com/phpDocumentor/ReflectionCommon/tree/2.x" + }, "time": "2020-06-27T09:03:43+00:00" }, { @@ -834,6 +950,10 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", + "support": { + "issues": "https://github.com/phpDocumentor/ReflectionDocBlock/issues", + "source": "https://github.com/phpDocumentor/ReflectionDocBlock/tree/master" + }, "time": "2020-09-03T19:13:55+00:00" }, { @@ -879,6 +999,10 @@ } ], "description": "A PSR-5 based resolver of Class names, Types and Structural Element Names", + "support": { + "issues": "https://github.com/phpDocumentor/TypeResolver/issues", + "source": "https://github.com/phpDocumentor/TypeResolver/tree/1.4.0" + }, "time": "2020-09-17T18:55:26+00:00" }, { @@ -942,44 +1066,52 @@ "spy", "stub" ], + "support": { + "issues": "https://github.com/phpspec/prophecy/issues", + "source": "https://github.com/phpspec/prophecy/tree/1.12.2" + }, "time": "2020-12-19T10:15:11+00:00" }, { "name": "phpunit/php-code-coverage", - "version": "6.1.4", + "version": "9.2.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d" + "reference": "f3e026641cc91909d421802dd3ac7827ebfd97e1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", - "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/f3e026641cc91909d421802dd3ac7827ebfd97e1", + "reference": "f3e026641cc91909d421802dd3ac7827ebfd97e1", "shasum": "" }, "require": { "ext-dom": "*", + "ext-libxml": "*", "ext-xmlwriter": "*", - "php": "^7.1", - "phpunit/php-file-iterator": "^2.0", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.0", - "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^3.1 || ^4.0", - "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1" + "nikic/php-parser": "^4.10.2", + "php": ">=7.3", + "phpunit/php-file-iterator": "^3.0.3", + "phpunit/php-text-template": "^2.0.2", + "sebastian/code-unit-reverse-lookup": "^2.0.2", + "sebastian/complexity": "^2.0", + "sebastian/environment": "^5.1.2", + "sebastian/lines-of-code": "^1.0.3", + "sebastian/version": "^3.0.1", + "theseer/tokenizer": "^1.2.0" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^9.3" }, "suggest": { - "ext-xdebug": "^2.6.0" + "ext-pcov": "*", + "ext-xdebug": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.1-dev" + "dev-master": "9.2-dev" } }, "autoload": { @@ -1005,32 +1137,42 @@ "testing", "xunit" ], - "time": "2018-10-31T16:06:48+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/php-code-coverage/issues", + "source": "https://github.com/sebastianbergmann/php-code-coverage/tree/9.2.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-28T06:44:49+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "2.0.3", + "version": "3.0.5", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357" + "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/4b49fb70f067272b659ef0174ff9ca40fdaa6357", - "reference": "4b49fb70f067272b659ef0174ff9ca40fdaa6357", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/aa4be8575f26070b100fccb67faabb28f21f66f8", + "reference": "aa4be8575f26070b100fccb67faabb28f21f66f8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -1055,26 +1197,48 @@ "filesystem", "iterator" ], - "time": "2020-11-30T08:25:21+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/php-file-iterator/issues", + "source": "https://github.com/sebastianbergmann/php-file-iterator/tree/3.0.5" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:57:25+00:00" }, { - "name": "phpunit/php-text-template", - "version": "1.2.1", + "name": "phpunit/php-invoker", + "version": "3.1.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-text-template.git", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + "url": "https://github.com/sebastianbergmann/php-invoker.git", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", - "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "url": "https://api.github.com/repos/sebastianbergmann/php-invoker/zipball/5a10147d0aaf65b58940a0b72f71c9ac0423cc67", + "reference": "5a10147d0aaf65b58940a0b72f71c9ac0423cc67", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=7.3" + }, + "require-dev": { + "ext-pcntl": "*", + "phpunit/phpunit": "^9.3" + }, + "suggest": { + "ext-pcntl": "*" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.1-dev" + } + }, "autoload": { "classmap": [ "src/" @@ -1091,37 +1255,47 @@ "role": "lead" } ], - "description": "Simple template engine.", - "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "description": "Invoke callables with a timeout", + "homepage": "https://github.com/sebastianbergmann/php-invoker/", "keywords": [ - "template" + "process" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-invoker/issues", + "source": "https://github.com/sebastianbergmann/php-invoker/tree/3.1.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } ], - "time": "2015-06-21T13:50:34+00:00" + "time": "2020-09-28T05:58:55+00:00" }, { - "name": "phpunit/php-timer", - "version": "2.1.3", + "name": "phpunit/php-text-template", + "version": "2.0.4", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662" + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/2454ae1765516d20c4ffe103d85a58a9a3bd5662", - "reference": "2454ae1765516d20c4ffe103d85a58a9a3bd5662", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", + "reference": "5da5f67fc95621df9ff4c4e5a84d6a8a2acf7c28", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.1-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -1140,38 +1314,47 @@ "role": "lead" } ], - "description": "Utility class for timing", - "homepage": "https://github.com/sebastianbergmann/php-timer/", + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", "keywords": [ - "timer" + "template" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-text-template/issues", + "source": "https://github.com/sebastianbergmann/php-text-template/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } ], - "time": "2020-11-30T08:20:02+00:00" + "time": "2020-10-26T05:33:50+00:00" }, { - "name": "phpunit/php-token-stream", - "version": "3.1.2", + "name": "phpunit/php-timer", + "version": "5.0.3", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "472b687829041c24b25f475e14c2f38a09edf1c2" + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/472b687829041c24b25f475e14c2f38a09edf1c2", - "reference": "472b687829041c24b25f475e14c2f38a09edf1c2", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", + "reference": "5a63ce20ed1b5bf577850e2c4e87f4aa902afbd2", "shasum": "" }, "require": { - "ext-tokenizer": "*", - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -1186,66 +1369,78 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" + "email": "sebastian@phpunit.de", + "role": "lead" } ], - "description": "Wrapper around PHP's tokenizer extension.", - "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", "keywords": [ - "tokenizer" + "timer" + ], + "support": { + "issues": "https://github.com/sebastianbergmann/php-timer/issues", + "source": "https://github.com/sebastianbergmann/php-timer/tree/5.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } ], - "abandoned": true, - "time": "2020-11-30T08:38:46+00:00" + "time": "2020-10-26T13:16:10+00:00" }, { "name": "phpunit/phpunit", - "version": "7.5.20", + "version": "9.5.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "9467db479d1b0487c99733bb1e7944d32deded2c" + "reference": "8e16c225d57c3d6808014df6b1dd7598d0a5bbbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9467db479d1b0487c99733bb1e7944d32deded2c", - "reference": "9467db479d1b0487c99733bb1e7944d32deded2c", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/8e16c225d57c3d6808014df6b1dd7598d0a5bbbe", + "reference": "8e16c225d57c3d6808014df6b1dd7598d0a5bbbe", "shasum": "" }, "require": { - "doctrine/instantiator": "^1.1", + "doctrine/instantiator": "^1.3.1", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "^1.7", - "phar-io/manifest": "^1.0.2", - "phar-io/version": "^2.0", - "php": "^7.1", - "phpspec/prophecy": "^1.7", - "phpunit/php-code-coverage": "^6.0.7", - "phpunit/php-file-iterator": "^2.0.1", - "phpunit/php-text-template": "^1.2.1", - "phpunit/php-timer": "^2.1", - "sebastian/comparator": "^3.0", - "sebastian/diff": "^3.0", - "sebastian/environment": "^4.0", - "sebastian/exporter": "^3.1", - "sebastian/global-state": "^2.0", - "sebastian/object-enumerator": "^3.0.3", - "sebastian/resource-operations": "^2.0", - "sebastian/version": "^2.0.1" - }, - "conflict": { - "phpunit/phpunit-mock-objects": "*" + "ext-xmlwriter": "*", + "myclabs/deep-copy": "^1.10.1", + "phar-io/manifest": "^2.0.1", + "phar-io/version": "^3.0.2", + "php": ">=7.3", + "phpspec/prophecy": "^1.12.1", + "phpunit/php-code-coverage": "^9.2.3", + "phpunit/php-file-iterator": "^3.0.5", + "phpunit/php-invoker": "^3.1.1", + "phpunit/php-text-template": "^2.0.3", + "phpunit/php-timer": "^5.0.2", + "sebastian/cli-parser": "^1.0.1", + "sebastian/code-unit": "^1.0.6", + "sebastian/comparator": "^4.0.5", + "sebastian/diff": "^4.0.3", + "sebastian/environment": "^5.1.3", + "sebastian/exporter": "^4.0.3", + "sebastian/global-state": "^5.0.1", + "sebastian/object-enumerator": "^4.0.3", + "sebastian/resource-operations": "^3.0.3", + "sebastian/type": "^2.3", + "sebastian/version": "^3.0.2" }, "require-dev": { - "ext-pdo": "*" + "ext-pdo": "*", + "phpspec/prophecy-phpunit": "^2.0.1" }, "suggest": { "ext-soap": "*", - "ext-xdebug": "*", - "phpunit/php-invoker": "^2.0" + "ext-xdebug": "*" }, "bin": [ "phpunit" @@ -1253,12 +1448,15 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "7.5-dev" + "dev-master": "9.5-dev" } }, "autoload": { "classmap": [ "src/" + ], + "files": [ + "src/Framework/Assert/Functions.php" ] }, "notification-url": "https://packagist.org/downloads/", @@ -1279,32 +1477,158 @@ "testing", "xunit" ], - "time": "2020-01-08T08:45:45+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/phpunit/issues", + "source": "https://github.com/sebastianbergmann/phpunit/tree/9.5.0" + }, + "funding": [ + { + "url": "https://phpunit.de/donate.html", + "type": "custom" + }, + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-12-04T05:05:53+00:00" + }, + { + "name": "sebastian/cli-parser", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/cli-parser.git", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/cli-parser/zipball/442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "reference": "442e7c7e687e42adc03470c7b668bc4b2402c0b2", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for parsing CLI options", + "homepage": "https://github.com/sebastianbergmann/cli-parser", + "support": { + "issues": "https://github.com/sebastianbergmann/cli-parser/issues", + "source": "https://github.com/sebastianbergmann/cli-parser/tree/1.0.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:08:49+00:00" + }, + { + "name": "sebastian/code-unit", + "version": "1.0.8", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/code-unit.git", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit/zipball/1fc9f64c0927627ef78ba436c9b17d967e68e120", + "reference": "1fc9f64c0927627ef78ba436c9b17d967e68e120", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the PHP code units", + "homepage": "https://github.com/sebastianbergmann/code-unit", + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit/issues", + "source": "https://github.com/sebastianbergmann/code-unit/tree/1.0.8" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:08:54+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", - "version": "1.0.2", + "version": "2.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619" + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/1de8cd5c010cb153fcd68b8d0f64606f523f7619", - "reference": "1de8cd5c010cb153fcd68b8d0f64606f523f7619", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", + "reference": "ac91f01ccec49fb77bdc6fd1e548bc70f7faa3e5", "shasum": "" }, "require": { - "php": ">=5.6" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -1324,34 +1648,44 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2020-11-30T08:15:22+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/issues", + "source": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/tree/2.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:30:19+00:00" }, { "name": "sebastian/comparator", - "version": "3.0.3", + "version": "4.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758" + "reference": "55f4261989e546dc112258c7a75935a81a7ce382" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/1071dfcef776a57013124ff35e1fc41ccd294758", - "reference": "1071dfcef776a57013124ff35e1fc41ccd294758", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/55f4261989e546dc112258c7a75935a81a7ce382", + "reference": "55f4261989e546dc112258c7a75935a81a7ce382", "shasum": "" }, "require": { - "php": ">=7.1", - "sebastian/diff": "^3.0", - "sebastian/exporter": "^3.1" + "php": ">=7.3", + "sebastian/diff": "^4.0", + "sebastian/exporter": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^8.5" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1388,33 +1722,100 @@ "compare", "equality" ], - "time": "2020-11-30T08:04:30+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/comparator/issues", + "source": "https://github.com/sebastianbergmann/comparator/tree/4.0.6" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T15:49:45+00:00" + }, + { + "name": "sebastian/complexity", + "version": "2.0.2", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/complexity.git", + "reference": "739b35e53379900cc9ac327b2147867b8b6efd88" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/complexity/zipball/739b35e53379900cc9ac327b2147867b8b6efd88", + "reference": "739b35e53379900cc9ac327b2147867b8b6efd88", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.7", + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for calculating the complexity of PHP code units", + "homepage": "https://github.com/sebastianbergmann/complexity", + "support": { + "issues": "https://github.com/sebastianbergmann/complexity/issues", + "source": "https://github.com/sebastianbergmann/complexity/tree/2.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T15:52:27+00:00" }, { "name": "sebastian/diff", - "version": "3.0.3", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211" + "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/14f72dd46eaf2f2293cbe79c93cc0bc43161a211", - "reference": "14f72dd46eaf2f2293cbe79c93cc0bc43161a211", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/3461e3fccc7cfdfc2720be910d3bd73c69be590d", + "reference": "3461e3fccc7cfdfc2720be910d3bd73c69be590d", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.5 || ^8.0", - "symfony/process": "^2 || ^3.3 || ^4" + "phpunit/phpunit": "^9.3", + "symfony/process": "^4.2 || ^5" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1444,27 +1845,37 @@ "unidiff", "unified diff" ], - "time": "2020-11-30T07:59:04+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/diff/issues", + "source": "https://github.com/sebastianbergmann/diff/tree/4.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:10:38+00:00" }, { "name": "sebastian/environment", - "version": "4.2.4", + "version": "5.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0" + "reference": "388b6ced16caa751030f6a69e588299fa09200ac" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", - "reference": "d47bbbad83711771f167c72d4e3f25f7fcc1f8b0", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/388b6ced16caa751030f6a69e588299fa09200ac", + "reference": "388b6ced16caa751030f6a69e588299fa09200ac", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^7.5" + "phpunit/phpunit": "^9.3" }, "suggest": { "ext-posix": "*" @@ -1472,7 +1883,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.2-dev" + "dev-master": "5.1-dev" } }, "autoload": { @@ -1497,34 +1908,44 @@ "environment", "hhvm" ], - "time": "2020-11-30T07:53:42+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/environment/issues", + "source": "https://github.com/sebastianbergmann/environment/tree/5.1.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:52:38+00:00" }, { "name": "sebastian/exporter", - "version": "3.1.3", + "version": "4.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e" + "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/6b853149eab67d4da22291d36f5b0631c0fd856e", - "reference": "6b853149eab67d4da22291d36f5b0631c0fd856e", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/d89cc98761b8cb5a1a235a6b703ae50d34080e65", + "reference": "d89cc98761b8cb5a1a235a6b703ae50d34080e65", "shasum": "" }, "require": { - "php": ">=7.0", - "sebastian/recursion-context": "^3.0" + "php": ">=7.3", + "sebastian/recursion-context": "^4.0" }, "require-dev": { "ext-mbstring": "*", - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.1.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1564,27 +1985,40 @@ "export", "exporter" ], - "time": "2020-11-30T07:47:53+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/exporter/issues", + "source": "https://github.com/sebastianbergmann/exporter/tree/4.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T05:24:23+00:00" }, { "name": "sebastian/global-state", - "version": "2.0.0", + "version": "5.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" + "reference": "a90ccbddffa067b51f574dea6eb25d5680839455" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", - "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/a90ccbddffa067b51f574dea6eb25d5680839455", + "reference": "a90ccbddffa067b51f574dea6eb25d5680839455", "shasum": "" }, "require": { - "php": "^7.0" + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "ext-dom": "*", + "phpunit/phpunit": "^9.3" }, "suggest": { "ext-uopz": "*" @@ -1592,7 +2026,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "5.0-dev" } }, "autoload": { @@ -1615,34 +2049,101 @@ "keywords": [ "global state" ], - "time": "2017-04-27T15:39:26+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/global-state/issues", + "source": "https://github.com/sebastianbergmann/global-state/tree/5.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T15:55:19+00:00" + }, + { + "name": "sebastian/lines-of-code", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/lines-of-code.git", + "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/lines-of-code/zipball/c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "reference": "c1c2e997aa3146983ed888ad08b15470a2e22ecc", + "shasum": "" + }, + "require": { + "nikic/php-parser": "^4.6", + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library for counting the lines of code in PHP source code", + "homepage": "https://github.com/sebastianbergmann/lines-of-code", + "support": { + "issues": "https://github.com/sebastianbergmann/lines-of-code/issues", + "source": "https://github.com/sebastianbergmann/lines-of-code/tree/1.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-11-28T06:42:11+00:00" }, { "name": "sebastian/object-enumerator", - "version": "3.0.4", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2" + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", - "reference": "e67f6d32ebd0c749cf9d1dbd9f226c727043cdf2", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/5c9eeac41b290a3712d88851518825ad78f45c71", + "reference": "5c9eeac41b290a3712d88851518825ad78f45c71", "shasum": "" }, "require": { - "php": ">=7.0", - "sebastian/object-reflector": "^1.1.1", - "sebastian/recursion-context": "^3.0" + "php": ">=7.3", + "sebastian/object-reflector": "^2.0", + "sebastian/recursion-context": "^4.0" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1662,32 +2163,42 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2020-11-30T07:40:27+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/object-enumerator/issues", + "source": "https://github.com/sebastianbergmann/object-enumerator/tree/4.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:12:34+00:00" }, { "name": "sebastian/object-reflector", - "version": "1.1.2", + "version": "2.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d" + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", - "reference": "9b8772b9cbd456ab45d4a598d2dd1a1bced6363d", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", + "reference": "b4f479ebdbf63ac605d183ece17d8d7fe49c15c7", "shasum": "" }, "require": { - "php": ">=7.0" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.1-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -1707,32 +2218,42 @@ ], "description": "Allows reflection of object attributes, including inherited and non-public ones", "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "time": "2020-11-30T07:37:18+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/object-reflector/issues", + "source": "https://github.com/sebastianbergmann/object-reflector/tree/2.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:14:26+00:00" }, { "name": "sebastian/recursion-context", - "version": "3.0.1", + "version": "4.0.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb" + "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/367dcba38d6e1977be014dc4b22f47a484dac7fb", - "reference": "367dcba38d6e1977be014dc4b22f47a484dac7fb", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/cd9d8cf3c5804de4341c283ed787f099f5506172", + "reference": "cd9d8cf3c5804de4341c283ed787f099f5506172", "shasum": "" }, "require": { - "php": ">=7.0" + "php": ">=7.3" }, "require-dev": { - "phpunit/phpunit": "^6.0" + "phpunit/phpunit": "^9.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0.x-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1760,29 +2281,42 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2020-11-30T07:34:24+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/recursion-context/issues", + "source": "https://github.com/sebastianbergmann/recursion-context/tree/4.0.4" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:17:30+00:00" }, { "name": "sebastian/resource-operations", - "version": "2.0.2", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3" + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/31d35ca87926450c44eae7e2611d45a7a65ea8b3", - "reference": "31d35ca87926450c44eae7e2611d45a7a65ea8b3", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", + "reference": "0f4443cb3a1d92ce809899753bc0d5d5a8dd19a8", "shasum": "" }, "require": { - "php": ">=7.1" + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -1802,29 +2336,95 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2020-11-30T07:30:19+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/resource-operations/issues", + "source": "https://github.com/sebastianbergmann/resource-operations/tree/3.0.3" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:45:17+00:00" + }, + { + "name": "sebastian/type", + "version": "2.3.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/type.git", + "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/type/zipball/81cd61ab7bbf2de744aba0ea61fae32f721df3d2", + "reference": "81cd61ab7bbf2de744aba0ea61fae32f721df3d2", + "shasum": "" + }, + "require": { + "php": ">=7.3" + }, + "require-dev": { + "phpunit/phpunit": "^9.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Collection of value objects that represent the types of the PHP type system", + "homepage": "https://github.com/sebastianbergmann/type", + "support": { + "issues": "https://github.com/sebastianbergmann/type/issues", + "source": "https://github.com/sebastianbergmann/type/tree/2.3.1" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-10-26T13:18:59+00:00" }, { "name": "sebastian/version", - "version": "2.0.1", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/version.git", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019" + "reference": "c6c1022351a901512170118436c764e473f6de8c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019", - "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/c6c1022351a901512170118436c764e473f6de8c", + "reference": "c6c1022351a901512170118436c764e473f6de8c", "shasum": "" }, "require": { - "php": ">=5.6" + "php": ">=7.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -1845,7 +2445,17 @@ ], "description": "Library that helps with managing the version number of Git-hosted PHP projects", "homepage": "https://github.com/sebastianbergmann/version", - "time": "2016-10-03T07:35:21+00:00" + "support": { + "issues": "https://github.com/sebastianbergmann/version/issues", + "source": "https://github.com/sebastianbergmann/version/tree/3.0.2" + }, + "funding": [ + { + "url": "https://github.com/sebastianbergmann", + "type": "github" + } + ], + "time": "2020-09-28T06:39:44+00:00" }, { "name": "symfony/polyfill-ctype", @@ -1907,6 +2517,23 @@ "polyfill", "portable" ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.20.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], "time": "2020-10-23T14:02:19+00:00" }, { @@ -1947,6 +2574,16 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "support": { + "issues": "https://github.com/theseer/tokenizer/issues", + "source": "https://github.com/theseer/tokenizer/tree/master" + }, + "funding": [ + { + "url": "https://github.com/theseer", + "type": "github" + } + ], "time": "2020-07-12T23:59:07+00:00" }, { @@ -1996,6 +2633,10 @@ "check", "validate" ], + "support": { + "issues": "https://github.com/webmozart/assert/issues", + "source": "https://github.com/webmozart/assert/tree/master" + }, "time": "2020-07-08T17:02:28+00:00" } ], @@ -2005,11 +2646,12 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": "^5.3.3 || ^7.0", + "php": "^5.3.3 || ^7.0 || ^8.0", "ext-curl": "*", "ext-json": "*" }, "platform-dev": { "ext-json": "*" - } + }, + "plugin-api-version": "2.0.0" } diff --git a/tests/ImageKit/File/FileTest.php b/tests/ImageKit/File/FileTest.php index 1042cc2..5c3551e 100644 --- a/tests/ImageKit/File/FileTest.php +++ b/tests/ImageKit/File/FileTest.php @@ -5,7 +5,7 @@ include_once __DIR__ . '/../../../src/ImageKit/Utils/transformation.php'; include_once __DIR__ . '/../../../src/ImageKit/Utils/authorization.php'; -use Faker; + use GuzzleHttp\Psr7\Response; use GuzzleHttp\Psr7; @@ -166,7 +166,6 @@ public function testGetDetailsWithEmptyFileId() public function testGetFileDetailsWithValidFileId() { - $faker = Faker\Factory::create(); $the_file_id = "5df36759adf3f523d81dd94f"; $mockBodyResponse = Psr7\stream_for(json_encode(array( @@ -342,7 +341,6 @@ public function testGetFileMetaDataDetails() // Delete Files public function testWhileDeletingMissingFileIdParameter() { - $faker = Faker\Factory::create(); $the_file_id = ""; @@ -361,7 +359,6 @@ public function testWhileDeletingMissingFileIdParameter() public function testDeleteFileWhenSuccessful() { - $faker = Faker\Factory::create(); $the_file_id = "5df36759adf3f523d81dd94f"; $mockBodyResponse = Psr7\stream_for(); @@ -379,7 +376,6 @@ public function testDeleteFileWhenSuccessful() // Bulk File Delete public function testBulkFileDeleteWhenMissingFileIdsParameter() { - $faker = Faker\Factory::create(); $options = ""; @@ -398,9 +394,8 @@ public function testBulkFileDeleteWhenMissingFileIdsParameter() public function testBulkFileDeleteWhenSuccessful() { - $faker = Faker\Factory::create(); - $fileIds = [$faker->ean13, $faker->ean13]; + $fileIds = ["6604876475937", "8242194892418"]; $options = array( "fileIds" => $fileIds ); @@ -425,7 +420,6 @@ public function testBulkFileDeleteWhenSuccessful() // Update details public function testUpdateFileDetailsWhenFileIDTagsAndCustomParameterIsPassed() { - $faker = Faker\Factory::create(); $the_file_id = "5df36759adf3f523d81dd94f"; @@ -508,11 +502,10 @@ public function testUpdateFileDetailsWhenFileIDParameterIsNotPassed() public function testUpdateFileDetailsWhenUpdateDataIsNotAnArray() { - $faker = Faker\Factory::create(); $the_file_id = "5df36759adf3f523d81dd94f"; - $updateData = $faker->streetName; + $updateData = "Keegan Trail"; $mockBodyResponse = Psr7\stream_for(json_encode(array( array( @@ -542,7 +535,6 @@ public function testUpdateFileDetailsWhenUpdateDataIsNotAnArray() public function testUpdateFileDetailsWhenUpdateDataTagIsInvalid() { - $faker = Faker\Factory::create(); $the_file_id = "5df36759adf3f523d81dd94f"; @@ -579,7 +571,6 @@ public function testUpdateFileDetailsWhenUpdateDataTagIsInvalid() public function testUpdateFileDetailsWhenUpdateCustomCoordinatesAreInvalid() { - $faker = Faker\Factory::create(); $the_file_id = "5df36759adf3f523d81dd94f"; @@ -617,7 +608,6 @@ public function testUpdateFileDetailsWhenUpdateCustomCoordinatesAreInvalid() // Purge Details public function testPurgeFileCacheApiWithoutUrlPatrameter() { - $faker = Faker\Factory::create(); $urlParam = ""; @@ -640,7 +630,6 @@ public function testPurgeFileCacheApiWithoutUrlPatrameter() public function testPurgeCacheApi() { - $faker = Faker\Factory::create(); $urlParam = "https://ik.imagekit.io/ot2cky3ujwa/default-image.jpg"; @@ -664,7 +653,6 @@ public function testPurgeCacheApi() // Purge Cache API Details public function testPurgeFileCacheApiStatusWithoutRequestId() { - $faker = Faker\Factory::create(); $requestId = ""; $mockBodyResponse = Psr7\stream_for(json_encode(array( @@ -725,9 +713,8 @@ public function testGetFileMetadataFromRemoteURLApiWhenURLParamIsMissing() public function testGetFileMetadataFromRemoteURLApiWhenSuccessful() { - $faker = Faker\Factory::create(); - $url = $faker->url; - $phash = $faker->ean13; + $url = "https://dummy.example.com/"; + $phash = "1578156593879"; $mockBodyResponse = Psr7\stream_for(json_encode(array( array("pHash" => $phash), diff --git a/tests/ImageKit/Signature/SignatureTest.php b/tests/ImageKit/Signature/SignatureTest.php index 5464cb5..c110a73 100644 --- a/tests/ImageKit/Signature/SignatureTest.php +++ b/tests/ImageKit/Signature/SignatureTest.php @@ -4,7 +4,7 @@ use ImageKit\Signature\Signature; use PHPUnit\Framework\TestCase; -use Faker; + class SignatureTest extends TestCase { diff --git a/tests/ImageKit/Upload/UploadTest.php b/tests/ImageKit/Upload/UploadTest.php index b6f026f..7b78cfa 100644 --- a/tests/ImageKit/Upload/UploadTest.php +++ b/tests/ImageKit/Upload/UploadTest.php @@ -10,16 +10,15 @@ use ImageKit\Resource\GuzzleHttpWrapper; use GuzzleHttp\Psr7\Response; use GuzzleHttp\Psr7; -use Faker; + final class UploadTest extends TestCase { public function testFileUploadIfMissingDataUpload() { - $faker = Faker\Factory::create(); - + $uploadOptions = array( - 'file' => $faker->imageUrl($width = 640, $height = 480), + 'file' => "http://lorempixel.com/640/480/", ); $mockBodyResponse = Psr7\stream_for(\json_encode(array( @@ -39,10 +38,10 @@ public function testFileUploadIfMissingDataUpload() public function testFileUploadIfMissingFileParameter() { - $faker = Faker\Factory::create(); + $uploadOptions = array( - 'fileName' => $faker->uuid, + 'fileName' => "7e57d004-2b97-0e7a-b45f-5387367791cd", ); @@ -63,7 +62,7 @@ public function testFileUploadIfMissingFileParameter() public function testFileUploadIfMissingDataForUpload() { - $faker = Faker\Factory::create(); + $uploadOptions = []; @@ -85,18 +84,18 @@ public function testFileUploadIfMissingDataForUpload() public function testFileUploadIfSuccessful() { - $faker = Faker\Factory::create(); + $uploadOptions = array( - 'file' => $faker->imageUrl($width = 640, $height = 480), - 'fileName' => $faker->uuid, + 'file' => "http://lorempixel.com/640/480/", + 'fileName' => "7e57d004-2b97-0e7a-b45f-5387367791cd", ); $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url, - 'transformationPosition' => $faker->word + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", + 'transformationPosition' => "path" ); $mockBodyResponse = Psr7\stream_for(\json_encode(array( @@ -117,19 +116,18 @@ public function testFileUploadIfSuccessful() } public function testFileUploadIfSuccessfulWithAllParameters() - { - $faker = Faker\Factory::create(); + { // parameters - $file = $faker->imageUrl($width = 640, $height = 480); - $fileName = $faker->uuid; - $useUniqueFileName = $faker->boolean($chanceOfGettingTrue = 50); - $tags = $faker->words($nb = 3, $asText = false); - $folder = $faker->word; - $isPrivateFile = $faker->boolean($chanceOfGettingTrue = 50); + $file = "http://lorempixel.com/640/480/"; + $fileName = "7e57d004-2b97-0e7a-b45f-5387367791cd"; + $useUniqueFileName = rand(0,1) == 1; + $tags = array('porro', 'sed', 'magni'); + $folder = 'aut'; + $isPrivateFile = rand(0,1) == 1; $customCoordinates = "10,10,100,100"; $responseFields = "name,tags,customCoordinates,isPrivateFile,metadata"; - $metadata = $faker->uuid; + $metadata = "7e57d004-2b97-0e7a-b45f-5387367791cd"; $uploadOptions = array( 'file' => $file, @@ -140,10 +138,10 @@ public function testFileUploadIfSuccessfulWithAllParameters() ); $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url, - 'transformationPosition' => $faker->word + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", + 'transformationPosition' => "path" ); $mockBodyResponse = Psr7\stream_for(\json_encode(array( diff --git a/tests/ImageKit/Url/UrlTest.php b/tests/ImageKit/Url/UrlTest.php index 2325f66..4c5c99d 100644 --- a/tests/ImageKit/Url/UrlTest.php +++ b/tests/ImageKit/Url/UrlTest.php @@ -4,7 +4,7 @@ use ImageKit\Url\Url; use PHPUnit\Framework\TestCase; -use Faker; + $composer = json_decode( file_get_contents(__DIR__ . "/../../../composer.json"), @@ -17,7 +17,6 @@ final class UrlTest extends TestCase { public function testUrlGenerationIfTransformationPositionIsPath() { - $faker = Faker\Factory::create(); $parameter = array( 'urlEndpoint' => "https://ik.imagekit.io/demo/pattern", 'path' => "path/to/my/image.jpg", @@ -28,10 +27,10 @@ public function testUrlGenerationIfTransformationPositionIsPath() ); $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url, - 'transformationPosition' => $faker->word + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", + 'transformationPosition' => "path" ); $opts = array_merge($defaultOptions, $parameter); @@ -45,7 +44,6 @@ public function testUrlGenerationIfTransformationPositionIsPath() public function testUrlGenerationCustomDomain() { - $faker = Faker\Factory::create(); $parameter = array( 'urlEndpoint' => "https://images.example.com", 'path' => "path/to/my/image.jpg", @@ -56,10 +54,10 @@ public function testUrlGenerationCustomDomain() ); $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url, - 'transformationPosition' => $faker->word + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", + 'transformationPosition' => "path" ); $opts = array_merge($defaultOptions, $parameter); @@ -73,7 +71,6 @@ public function testUrlGenerationCustomDomain() public function testUrlGenerationIfTransformationPositionIsQuery() { - $faker = Faker\Factory::create(); $parameter = array( 'urlEndpoint' => "https://ik.imagekit.io/demo/pattern", 'transformation' => array(array('width' => '200', 'height' => '300')), @@ -85,9 +82,9 @@ public function testUrlGenerationIfTransformationPositionIsQuery() $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url, + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", ); $opts = array_merge($defaultOptions, $parameter); @@ -102,7 +99,6 @@ public function testUrlGenerationIfTransformationPositionIsQuery() public function testUrlGenerationIfPathAndSrcEmpty() { - $faker = Faker\Factory::create(); $parameter = array( 'urlEndpoint' => "https://ik.imagekit.io/demo/pattern", 'path' => "", @@ -115,10 +111,10 @@ public function testUrlGenerationIfPathAndSrcEmpty() ); $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url, - 'transformationPosition' => $faker->word + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", + 'transformationPosition' => "path" ); $opts = array_merge($parameter, $defaultOptions); @@ -129,7 +125,6 @@ public function testUrlGenerationIfPathAndSrcEmpty() public function testUrlGenerationUsingFullImageUrlWhenPassedSrc() { - $faker = Faker\Factory::create(); $parameter = array( 'transformation' => array(array('width' => '200', 'height' => '300'), array('rotation' => '90')), 'src' => "https://ik.imagekit.io/your_imagekit_id/endpoint/default-image.jpg", @@ -138,9 +133,9 @@ public function testUrlGenerationUsingFullImageUrlWhenPassedSrc() ); $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url, + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", ); $opts = array_merge($parameter, $defaultOptions); @@ -154,7 +149,6 @@ public function testUrlGenerationUsingFullImageUrlWhenPassedSrc() public function testUrlGenerationUsingFullImageUrlWhenPassedSrcWithQueryParameters() { - $faker = Faker\Factory::create(); $parameter = array( 'transformation' => array(array('width' => '200', 'height' => '300'), array('rotation' => '90')), 'src' => "https://ik.imagekit.io/your_imagekit_id/endpoint/default-image.jpg", @@ -163,17 +157,17 @@ public function testUrlGenerationUsingFullImageUrlWhenPassedSrcWithQueryParamete ); $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url, + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", ); $opts = array_merge($parameter, $defaultOptions); $urlInstance = new Url(); $url = $urlInstance->buildURL($opts); - $this->assertNotContains("??", $url); - $this->assertNotContains("&&", $url); + $this->assertStringNotContainsString("??", $url); + $this->assertStringNotContainsString("&&", $url); $this->assertEquals( 'https://ik.imagekit.io/your_imagekit_id/endpoint/default-image.jpg?tr=w-200%2Ch-300%3Art-90&test=params&test2=param2&ik-sdk-version=php-' . CURRENT_SDK_VERSION, $url @@ -182,7 +176,6 @@ public function testUrlGenerationUsingFullImageUrlWhenPassedSrcWithQueryParamete public function testUrlGenerationUsingFullImageUrlWhenPassedSrcWithQueryParametersAndTransforamtionPositionIsPath() { - $faker = Faker\Factory::create(); $parameter = array( 'src' => "https://ik.imagekit.io/your_imagekit_id/endpoint/default-image.jpg", 'transformationPosition' => 'path', @@ -190,9 +183,9 @@ public function testUrlGenerationUsingFullImageUrlWhenPassedSrcWithQueryParamete ); $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url, + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", ); $opts = array_merge($parameter, $defaultOptions); @@ -207,7 +200,6 @@ public function testUrlGenerationUsingFullImageUrlWhenPassedSrcWithQueryParamete public function testSignedUrlGeneration() { - $faker = Faker\Factory::create(); $parameter = array( 'urlEndpoint' => "https://ik.imagekit.io/demo/pattern", 'path' => "path/to/my/image.jpg", @@ -219,9 +211,9 @@ public function testSignedUrlGeneration() ); $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url, + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", ); $opts = array_merge($defaultOptions, $parameter); @@ -237,7 +229,6 @@ public function testSignedUrlGeneration() public function testUrlGenerationIfInitializationUrlEndpointIsOverriddenByNewUrlEndpoint() { - $faker = Faker\Factory::create(); $parameter = array( 'urlEndpoint' => "https://ik.imagekit.io/demo/pattern", 'path' => "path/to/my/image.jpg", @@ -248,9 +239,9 @@ public function testUrlGenerationIfInitializationUrlEndpointIsOverriddenByNewUrl ); $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url, + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", ); $opts = array_merge($defaultOptions, $parameter); @@ -264,7 +255,6 @@ public function testUrlGenerationIfInitializationUrlEndpointIsOverriddenByNewUrl public function testUrlGenerationIfPresenceOfTrailingSlashInUrlEndpointWillGenerateValidUrl() { - $faker = Faker\Factory::create(); $parameter = array( 'urlEndpoint' => "https://ik.imagekit.io/demo/pattern/", 'path' => "path/to/my/image.jpg", @@ -275,9 +265,9 @@ public function testUrlGenerationIfPresenceOfTrailingSlashInUrlEndpointWillGener ); $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url, + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", ); $opts = array_merge($defaultOptions, $parameter); @@ -291,7 +281,6 @@ public function testUrlGenerationIfPresenceOfTrailingSlashInUrlEndpointWillGener public function testUrlGenerationIfPresenceOfLeadingSlashInPathWillGenerateValidUrl() { - $faker = Faker\Factory::create(); $parameter = array( 'urlEndpoint' => "https://ik.imagekit.io/demo/pattern", 'path' => "/path/to/my/image.jpg", @@ -302,9 +291,9 @@ public function testUrlGenerationIfPresenceOfLeadingSlashInPathWillGenerateValid ); $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url, + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", ); $opts = array_merge($defaultOptions, $parameter); @@ -318,7 +307,6 @@ public function testUrlGenerationIfPresenceOfLeadingSlashInPathWillGenerateValid public function testUrlGenerationIfNewTransformationParameterIsPassedWillBePresentInGeneratedUrl() { - $faker = Faker\Factory::create(); $parameter = array( 'urlEndpoint' => "https://ik.imagekit.io/demo/pattern", 'path' => "path/to/my/image.jpg", @@ -329,9 +317,9 @@ public function testUrlGenerationIfNewTransformationParameterIsPassedWillBePrese ); $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url, + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", ); $opts = array_merge($defaultOptions, $parameter); @@ -345,7 +333,6 @@ public function testUrlGenerationIfNewTransformationParameterIsPassedWillBePrese public function testUrlGenerationIfGeneratedUrlContainsSDKVersion() { - $faker = Faker\Factory::create(); $parameter = array( 'urlEndpoint' => "https://ik.imagekit.io/demo/pattern", 'transformation' => array(array('width' => '200', 'height' => '300')), @@ -357,9 +344,9 @@ public function testUrlGenerationIfGeneratedUrlContainsSDKVersion() $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url, + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", ); $opts = array_merge($defaultOptions, $parameter); @@ -375,7 +362,6 @@ public function testUrlGenerationIfGeneratedUrlContainsSDKVersion() public function testUrlGenerationIfTransformationPositionIsQueryAndTransformationArePresentInUrlAsQueryParams() { - $faker = Faker\Factory::create(); $parameter = array( 'urlEndpoint' => "https://ik.imagekit.io/demo/pattern", 'transformation' => array(array('width' => '200', 'height' => '300')), @@ -387,9 +373,9 @@ public function testUrlGenerationIfTransformationPositionIsQueryAndTransformatio $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url, + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", ); $opts = array_merge($defaultOptions, $parameter); @@ -405,7 +391,6 @@ public function testUrlGenerationIfTransformationPositionIsQueryAndTransformatio public function testUrlGenerationWithChainedTransformationIfTransformationPositionIsPath() { - $faker = Faker\Factory::create(); $parameter = array( 'urlEndpoint' => "https://ik.imagekit.io/demo/pattern", 'path' => "path/to/my/image.jpg", @@ -416,9 +401,9 @@ public function testUrlGenerationWithChainedTransformationIfTransformationPositi ); $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", ); $opts = array_merge($defaultOptions, $parameter); @@ -432,7 +417,6 @@ public function testUrlGenerationWithChainedTransformationIfTransformationPositi public function testUrlGenerationWithChainedTransformationIfTransformationPositionIsQuery() { - $faker = Faker\Factory::create(); $parameter = array( 'urlEndpoint' => "https://ik.imagekit.io/demo/pattern", 'path' => "path/to/my/image.jpg", @@ -443,9 +427,9 @@ public function testUrlGenerationWithChainedTransformationIfTransformationPositi ); $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", ); $opts = array_merge($defaultOptions, $parameter); @@ -459,7 +443,6 @@ public function testUrlGenerationWithChainedTransformationIfTransformationPositi public function testUrlGenerationWithQueryParametersIfTransformationPositionIsPath() { - $faker = Faker\Factory::create(); $parameter = array( 'urlEndpoint' => "https://ik.imagekit.io/demo/pattern", 'path' => "path/to/my/image.jpg", @@ -470,9 +453,9 @@ public function testUrlGenerationWithQueryParametersIfTransformationPositionIsPa ); $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", ); $opts = array_merge($defaultOptions, $parameter); @@ -486,7 +469,6 @@ public function testUrlGenerationWithQueryParametersIfTransformationPositionIsPa public function testUrlGenerationWithQueryParametersIfTransformationPositionIsQuery() { - $faker = Faker\Factory::create(); $parameter = array( 'urlEndpoint' => "https://ik.imagekit.io/demo/pattern", 'path' => "path/to/my/image.jpg", @@ -497,9 +479,9 @@ public function testUrlGenerationWithQueryParametersIfTransformationPositionIsQu ); $defaultOptions = array( - 'publicKey' => $faker->uuid, - 'privateKey' => $faker->uuid, - 'urlEndpoint' => $faker->url, + 'publicKey' => "dummy_public_key", + 'privateKey' => "dummy_private_key", + 'urlEndpoint' => "https://dummy.example.com", ); $opts = array_merge($defaultOptions, $parameter); @@ -532,7 +514,7 @@ public function testUrlGenerationWithDefaultExpiredSeconds() $url_components = parse_url($url); parse_str($url_components['query'], $params); - $this->assertNotContains('?&', $url); + $this->assertStringNotContainsString('?&', $url); $this->assertNotEmpty($params['ik-s']); } @@ -558,7 +540,7 @@ public function testUrlGenerationWithCustomExpiredSeconds() $url_components = parse_url($url); parse_str($url_components['query'], $params); - $this->assertNotContains('?&', $url); + $this->assertStringNotContainsString('?&', $url); $this->assertNotEmpty($params['ik-t']); } From 5c6bee1f3b0e00bb2816695fad9e75be67cc6901 Mon Sep 17 00:00:00 2001 From: Abhinav Dhiman Date: Mon, 4 Jan 2021 19:33:46 +0530 Subject: [PATCH 2/3] Updated PHP Version to 8 in workflow --- .github/workflows/php.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml index dfced5e..11d8ffb 100644 --- a/.github/workflows/php.yml +++ b/.github/workflows/php.yml @@ -11,7 +11,7 @@ jobs: - name: Setup PHP uses: shivammathur/setup-php@v2 with: - php-version: '7.4' + php-version: '8.0' - name: Validate composer.json and composer.lock run: composer validate From 5c75441327ca98b23522fb16f3c7c10807634cb7 Mon Sep 17 00:00:00 2001 From: Abinav Dhiman Date: Mon, 11 Jan 2021 19:27:07 +0000 Subject: [PATCH 3/3] Upgraded Guzzle to support 6.0 and 7.0 --- composer.json | 2 +- composer.lock | 370 ++++++++++++++------------------------------------ 2 files changed, 104 insertions(+), 268 deletions(-) diff --git a/composer.json b/composer.json index eb33bcb..f9db970 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "require": { "php":"^5.3.3 || ^7.0 || ^8.0", "ext-curl": "*", - "guzzlehttp/guzzle": "~6.0", + "guzzlehttp/guzzle": "~6.0 || ~7.0", "ext-json": "*" }, "require-dev": { diff --git a/composer.lock b/composer.lock index 3ffabec..8c06cca 100644 --- a/composer.lock +++ b/composer.lock @@ -4,41 +4,47 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f6fe0f7dade757482705ee4f343443f1", + "content-hash": "6ddbdb84f7993e11a3e5a8e722cbf6b7", "packages": [ { "name": "guzzlehttp/guzzle", - "version": "6.5.5", + "version": "7.2.0", "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e" + "reference": "0aa74dfb41ae110835923ef10a9d803a22d50e79" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", - "reference": "9d4290de1cfd701f38099ef7e183b64b4b7b0c5e", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/0aa74dfb41ae110835923ef10a9d803a22d50e79", + "reference": "0aa74dfb41ae110835923ef10a9d803a22d50e79", "shasum": "" }, "require": { "ext-json": "*", - "guzzlehttp/promises": "^1.0", - "guzzlehttp/psr7": "^1.6.1", - "php": ">=5.5", - "symfony/polyfill-intl-idn": "^1.17.0" + "guzzlehttp/promises": "^1.4", + "guzzlehttp/psr7": "^1.7", + "php": "^7.2.5 || ^8.0", + "psr/http-client": "^1.0" + }, + "provide": { + "psr/http-client-implementation": "1.0" }, "require-dev": { "ext-curl": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4 || ^7.0", + "php-http/client-integration-tests": "^3.0", + "phpunit/phpunit": "^8.5.5 || ^9.3.5", "psr/log": "^1.1" }, "suggest": { + "ext-curl": "Required for CURL handler support", + "ext-intl": "Required for Internationalized Domain Name (IDN) support", "psr/log": "Required for using the Log middleware" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "6.5-dev" + "dev-master": "7.1-dev" } }, "autoload": { @@ -58,6 +64,11 @@ "name": "Michael Dowling", "email": "mtdowling@gmail.com", "homepage": "https://github.com/mtdowling" + }, + { + "name": "Márk Sági-Kazár", + "email": "mark.sagikazar@gmail.com", + "homepage": "https://sagikazarmark.hu" } ], "description": "Guzzle is a PHP HTTP client library", @@ -68,14 +79,34 @@ "framework", "http", "http client", + "psr-18", + "psr-7", "rest", "web service" ], "support": { "issues": "https://github.com/guzzle/guzzle/issues", - "source": "https://github.com/guzzle/guzzle/tree/6.5" + "source": "https://github.com/guzzle/guzzle/tree/7.2.0" }, - "time": "2020-06-16T21:01:06+00:00" + "funding": [ + { + "url": "https://github.com/GrahamCampbell", + "type": "github" + }, + { + "url": "https://github.com/Nyholm", + "type": "github" + }, + { + "url": "https://github.com/alexeyshockov", + "type": "github" + }, + { + "url": "https://github.com/gmponos", + "type": "github" + } + ], + "time": "2020-10-10T11:47:56+00:00" }, { "name": "guzzlehttp/promises", @@ -207,6 +238,58 @@ }, "time": "2020-09-30T07:37:11+00:00" }, + { + "name": "psr/http-client", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-client.git", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-client/zipball/2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "reference": "2dfb5f6c5eff0e91e20e913f8c5452ed95b86621", + "shasum": "" + }, + "require": { + "php": "^7.0 || ^8.0", + "psr/http-message": "^1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Client\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP clients", + "homepage": "https://github.com/php-fig/http-client", + "keywords": [ + "http", + "http-client", + "psr", + "psr-18" + ], + "support": { + "source": "https://github.com/php-fig/http-client/tree/master" + }, + "time": "2020-06-29T06:28:15+00:00" + }, { "name": "psr/http-message", "version": "1.0.1", @@ -303,253 +386,6 @@ "source": "https://github.com/ralouphie/getallheaders/tree/develop" }, "time": "2019-03-08T08:55:37+00:00" - }, - { - "name": "symfony/polyfill-intl-idn", - "version": "v1.20.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-idn.git", - "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-idn/zipball/3b75acd829741c768bc8b1f84eb33265e7cc5117", - "reference": "3b75acd829741c768bc8b1f84eb33265e7cc5117", - "shasum": "" - }, - "require": { - "php": ">=7.1", - "symfony/polyfill-intl-normalizer": "^1.10", - "symfony/polyfill-php72": "^1.10" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.20-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Idn\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Laurent Bassin", - "email": "laurent@bassin.info" - }, - { - "name": "Trevor Rowbotham", - "email": "trevor.rowbotham@pm.me" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for intl's idn_to_ascii and idn_to_utf8 functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "idn", - "intl", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-idn/tree/v1.20.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-10-23T14:02:19+00:00" - }, - { - "name": "symfony/polyfill-intl-normalizer", - "version": "v1.20.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-intl-normalizer.git", - "reference": "727d1096295d807c309fb01a851577302394c897" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-intl-normalizer/zipball/727d1096295d807c309fb01a851577302394c897", - "reference": "727d1096295d807c309fb01a851577302394c897", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "suggest": { - "ext-intl": "For best performance" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.20-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Intl\\Normalizer\\": "" - }, - "files": [ - "bootstrap.php" - ], - "classmap": [ - "Resources/stubs" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill for intl's Normalizer class and related functions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "intl", - "normalizer", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-intl-normalizer/tree/v1.20.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-10-23T14:02:19+00:00" - }, - { - "name": "symfony/polyfill-php72", - "version": "v1.20.0", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php72.git", - "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php72/zipball/cede45fcdfabdd6043b3592e83678e42ec69e930", - "reference": "cede45fcdfabdd6043b3592e83678e42ec69e930", - "shasum": "" - }, - "require": { - "php": ">=7.1" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-main": "1.20-dev" - }, - "thanks": { - "name": "symfony/polyfill", - "url": "https://github.com/symfony/polyfill" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php72\\": "" - }, - "files": [ - "bootstrap.php" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Nicolas Grekas", - "email": "p@tchwork.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony polyfill backporting some PHP 7.2+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "support": { - "source": "https://github.com/symfony/polyfill-php72/tree/v1.20.0" - }, - "funding": [ - { - "url": "https://symfony.com/sponsor", - "type": "custom" - }, - { - "url": "https://github.com/fabpot", - "type": "github" - }, - { - "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", - "type": "tidelift" - } - ], - "time": "2020-10-23T14:02:19+00:00" } ], "packages-dev": [ @@ -2459,16 +2295,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.20.0", + "version": "v1.22.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41" + "reference": "c6c942b1ac76c82448322025e084cadc56048b4e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f4ba089a5b6366e453971d3aad5fe8e897b37f41", - "reference": "f4ba089a5b6366e453971d3aad5fe8e897b37f41", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/c6c942b1ac76c82448322025e084cadc56048b4e", + "reference": "c6c942b1ac76c82448322025e084cadc56048b4e", "shasum": "" }, "require": { @@ -2480,7 +2316,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-main": "1.20-dev" + "dev-main": "1.22-dev" }, "thanks": { "name": "symfony/polyfill", @@ -2518,7 +2354,7 @@ "portable" ], "support": { - "source": "https://github.com/symfony/polyfill-ctype/tree/v1.20.0" + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.22.0" }, "funding": [ { @@ -2534,7 +2370,7 @@ "type": "tidelift" } ], - "time": "2020-10-23T14:02:19+00:00" + "time": "2021-01-07T16:49:33+00:00" }, { "name": "theseer/tokenizer",