diff --git a/.gitignore b/.gitignore index 5906b6e08..225a8804c 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,4 @@ data/config.php *.bak /config.php !docker/var/wwww/app/config.php -node_modules +node_modules \ No newline at end of file diff --git a/.travis.yml b/.travis.yml index fbdba05b1..e002452bb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,9 +11,9 @@ language: php sudo: false php: + - 7.4 - 7.3 - 7.2 - - 5.6 env: - DB=sqlite @@ -22,8 +22,8 @@ env: matrix: fast_finish: true -before_install: - - composer install +before_script: + - composer install --no-interaction - npm install -g jshint script: diff --git a/app/Core/User/UserSession.php b/app/Core/User/UserSession.php index d5f851e6b..13d4a1d61 100644 --- a/app/Core/User/UserSession.php +++ b/app/Core/User/UserSession.php @@ -223,7 +223,7 @@ class UserSession extends Base public function getFilters($projectID) { if (! session_exists('filters:'.$projectID)) { - return session_get('user')['filter'] ?: 'status:open'; + return session_get('user') ? session_get('user')['filter'] ?: 'status:open' : 'status:open'; } return session_get('filters:'.$projectID); diff --git a/app/check_setup.php b/app/check_setup.php index dd3aeb040..6d6baf667 100644 --- a/app/check_setup.php +++ b/app/check_setup.php @@ -1,8 +1,8 @@ =5.6.0", + "php" : ">=7.2.0", "ext-simplexml" : "*", "ext-dom" : "*", "ext-xml" : "*", @@ -50,17 +50,17 @@ ] }, "require-dev" : { - "phpunit/php-code-coverage": "4.0.8", - "phpunit/php-token-stream": "1.4.12", - "doctrine/instantiator": "1.0.5", + "phpunit/php-code-coverage": "^6", + "phpunit/php-token-stream": "^3.1", + "doctrine/instantiator": "^1.1", "phpdocumentor/reflection-docblock": "3.3.2", "symfony/debug": "3.4.2", "symfony/yaml": "3.4.2", "symfony/finder": "3.4.8", "symfony/stopwatch" : "3.4.2", "myclabs/deep-copy": "1.7.0", - "phpunit/phpunit" : "5.7.24", - "phpunit/phpunit-selenium": "3.0.3", + "phpunit/phpunit" : "^7", + "phpunit/phpunit-selenium": "^7", "roave/security-advisories": "dev-master" } } diff --git a/composer.lock b/composer.lock index 5a9769a83..ce94d6dfb 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": "c59507f744331c4f7e7a2cb687c146ae", + "content-hash": "80f50a83a5397d8064b52ea68f53c74d", "packages": [ { "name": "christian-riesen/base32", @@ -751,16 +751,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.12.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", "shasum": "" }, "require": { @@ -772,7 +772,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -806,38 +806,40 @@ "portable", "shim" ], - "time": "2019-08-06T08:03:45+00:00" + "time": "2019-11-27T14:18:11+00:00" } ], "packages-dev": [ { "name": "doctrine/instantiator", - "version": "1.0.5", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + "reference": "ae466f726242e637cebdd526a7d991b9433bacf1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", - "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/ae466f726242e637cebdd526a7d991b9433bacf1", + "reference": "ae466f726242e637cebdd526a7d991b9433bacf1", "shasum": "" }, "require": { - "php": ">=5.3,<8.0-DEV" + "php": "^7.1" }, "require-dev": { - "athletic/athletic": "~0.1.8", + "doctrine/coding-standard": "^6.0", "ext-pdo": "*", "ext-phar": "*", - "phpunit/phpunit": "~4.0", - "squizlabs/php_codesniffer": "~2.0" + "phpbench/phpbench": "^0.13", + "phpstan/phpstan-phpunit": "^0.11", + "phpstan/phpstan-shim": "^0.11", + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "1.2.x-dev" } }, "autoload": { @@ -857,12 +859,12 @@ } ], "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", - "homepage": "https://github.com/doctrine/instantiator", + "homepage": "https://www.doctrine-project.org/projects/instantiator.html", "keywords": [ "constructor", "instantiate" ], - "time": "2015-06-14T21:17:01+00:00" + "time": "2019-10-21T16:45:58+00:00" }, { "name": "myclabs/deep-copy", @@ -909,6 +911,108 @@ ], "time": "2017-10-19T19:58:43+00:00" }, + { + "name": "phar-io/manifest", + "version": "1.0.3", + "source": { + "type": "git", + "url": "https://github.com/phar-io/manifest.git", + "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/manifest/zipball/7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-phar": "*", + "phar-io/version": "^2.0", + "php": "^5.6 || ^7.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", + "time": "2018-07-08T19:23:20+00:00" + }, + { + "name": "phar-io/version", + "version": "2.0.1", + "source": { + "type": "git", + "url": "https://github.com/phar-io/version.git", + "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/phar-io/version/zipball/45a2ec53a73c70ce41d55cedef9063630abaf1b6", + "reference": "45a2ec53a73c70ce41d55cedef9063630abaf1b6", + "shasum": "" + }, + "require": { + "php": "^5.6 || ^7.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + }, + { + "name": "Sebastian Heuer", + "email": "sebastian@phpeople.de", + "role": "Developer" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "Developer" + } + ], + "description": "Library for handling version information and constraints", + "time": "2018-07-08T19:19:57+00:00" + }, { "name": "phpdocumentor/reflection-common", "version": "1.0.1", @@ -1120,40 +1224,40 @@ }, { "name": "phpunit/php-code-coverage", - "version": "4.0.8", + "version": "6.1.4", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-code-coverage.git", - "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d" + "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/ef7b2f56815df854e66ceaee8ebe9393ae36a40d", - "reference": "ef7b2f56815df854e66ceaee8ebe9393ae36a40d", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", + "reference": "807e6013b00af69b6c5d9ceb4282d0393dbb9d8d", "shasum": "" }, "require": { "ext-dom": "*", "ext-xmlwriter": "*", - "php": "^5.6 || ^7.0", - "phpunit/php-file-iterator": "^1.3", - "phpunit/php-text-template": "^1.2", - "phpunit/php-token-stream": "^1.4.2 || ^2.0", - "sebastian/code-unit-reverse-lookup": "^1.0", - "sebastian/environment": "^1.3.2 || ^2.0", - "sebastian/version": "^1.0 || ^2.0" + "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" }, "require-dev": { - "ext-xdebug": "^2.1.4", - "phpunit/phpunit": "^5.7" + "phpunit/phpunit": "^7.0" }, "suggest": { - "ext-xdebug": "^2.5.1" + "ext-xdebug": "^2.6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0.x-dev" + "dev-master": "6.1-dev" } }, "autoload": { @@ -1168,7 +1272,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -1179,29 +1283,32 @@ "testing", "xunit" ], - "time": "2017-04-02T07:44:40+00:00" + "time": "2018-10-31T16:06:48+00:00" }, { "name": "phpunit/php-file-iterator", - "version": "1.4.5", + "version": "2.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4" + "reference": "050bedf145a257b1ff02746c31894800e5122946" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4", - "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/050bedf145a257b1ff02746c31894800e5122946", + "reference": "050bedf145a257b1ff02746c31894800e5122946", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.1" + }, + "require-dev": { + "phpunit/phpunit": "^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4.x-dev" + "dev-master": "2.0.x-dev" } }, "autoload": { @@ -1216,7 +1323,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -1226,7 +1333,7 @@ "filesystem", "iterator" ], - "time": "2017-11-27T13:52:08+00:00" + "time": "2018-09-13T20:33:42+00:00" }, { "name": "phpunit/php-text-template", @@ -1271,28 +1378,28 @@ }, { "name": "phpunit/php-timer", - "version": "1.0.9", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f" + "reference": "1038454804406b0b5f5f520358e78c1c2f71501e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", - "reference": "3dcf38ca72b158baf0bc245e9184d3fdffa9c46f", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/1038454804406b0b5f5f520358e78c1c2f71501e", + "reference": "1038454804406b0b5f5f520358e78c1c2f71501e", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "2.1-dev" } }, "autoload": { @@ -1307,7 +1414,7 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", + "email": "sebastian@phpunit.de", "role": "lead" } ], @@ -1316,33 +1423,33 @@ "keywords": [ "timer" ], - "time": "2017-02-26T11:10:40+00:00" + "time": "2019-06-07T04:22:29+00:00" }, { "name": "phpunit/php-token-stream", - "version": "1.4.12", + "version": "3.1.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16" + "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/1ce90ba27c42e4e44e6d8458241466380b51fa16", - "reference": "1ce90ba27c42e4e44e6d8458241466380b51fa16", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/995192df77f63a59e47f025390d2d1fdf8f425ff", + "reference": "995192df77f63a59e47f025390d2d1fdf8f425ff", "shasum": "" }, "require": { "ext-tokenizer": "*", - "php": ">=5.3.3" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "^7.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -1365,55 +1472,57 @@ "keywords": [ "tokenizer" ], - "time": "2017-12-04T08:55:13+00:00" + "time": "2019-09-17T06:23:10+00:00" }, { "name": "phpunit/phpunit", - "version": "5.7.24", + "version": "7.5.18", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "f0b07fbcb0c563eae088736dd0c81acba1d31ac3" + "reference": "fcf6c4bfafaadc07785528b06385cce88935474d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/f0b07fbcb0c563eae088736dd0c81acba1d31ac3", - "reference": "f0b07fbcb0c563eae088736dd0c81acba1d31ac3", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/fcf6c4bfafaadc07785528b06385cce88935474d", + "reference": "fcf6c4bfafaadc07785528b06385cce88935474d", "shasum": "" }, "require": { + "doctrine/instantiator": "^1.1", "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", "ext-mbstring": "*", "ext-xml": "*", - "myclabs/deep-copy": "~1.3", - "php": "^5.6 || ^7.0", - "phpspec/prophecy": "^1.6.2", - "phpunit/php-code-coverage": "^4.0.4", - "phpunit/php-file-iterator": "~1.4", - "phpunit/php-text-template": "~1.2", - "phpunit/php-timer": "^1.0.6", - "phpunit/phpunit-mock-objects": "^3.2", - "sebastian/comparator": "^1.2.4", - "sebastian/diff": "^1.4.3", - "sebastian/environment": "^1.3.4 || ^2.0", - "sebastian/exporter": "~2.0", - "sebastian/global-state": "^1.1", - "sebastian/object-enumerator": "~2.0", - "sebastian/resource-operations": "~1.0", - "sebastian/version": "~1.0.3|~2.0", - "symfony/yaml": "~2.1|~3.0|~4.0" + "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": { - "phpdocumentor/reflection-docblock": "3.0.2" + "phpunit/phpunit-mock-objects": "*" }, "require-dev": { "ext-pdo": "*" }, "suggest": { + "ext-soap": "*", "ext-xdebug": "*", - "phpunit/php-invoker": "~1.1" + "phpunit/php-invoker": "^2.0" }, "bin": [ "phpunit" @@ -1421,7 +1530,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "5.7.x-dev" + "dev-master": "7.5-dev" } }, "autoload": { @@ -1447,88 +1556,26 @@ "testing", "xunit" ], - "time": "2017-11-14T07:52:47+00:00" - }, - { - "name": "phpunit/phpunit-mock-objects", - "version": "3.4.4", - "source": { - "type": "git", - "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "a23b761686d50a560cc56233b9ecf49597cc9118" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/a23b761686d50a560cc56233b9ecf49597cc9118", - "reference": "a23b761686d50a560cc56233b9ecf49597cc9118", - "shasum": "" - }, - "require": { - "doctrine/instantiator": "^1.0.2", - "php": "^5.6 || ^7.0", - "phpunit/php-text-template": "^1.2", - "sebastian/exporter": "^1.2 || ^2.0" - }, - "conflict": { - "phpunit/phpunit": "<5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "^5.4" - }, - "suggest": { - "ext-soap": "*" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "3.2.x-dev" - } - }, - "autoload": { - "classmap": [ - "src/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-3-Clause" - ], - "authors": [ - { - "name": "Sebastian Bergmann", - "email": "sb@sebastian-bergmann.de", - "role": "lead" - } - ], - "description": "Mock Object library for PHPUnit", - "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", - "keywords": [ - "mock", - "xunit" - ], - "abandoned": true, - "time": "2017-06-30T09:13:00+00:00" + "time": "2019-12-06T05:14:37+00:00" }, { "name": "phpunit/phpunit-selenium", - "version": "3.0.3", + "version": "7.0.0", "source": { "type": "git", "url": "https://github.com/giorgiosironi/phpunit-selenium.git", - "reference": "343ba4e389ad97046c78fb2c7111e199795e7a80" + "reference": "3129be3c3a90bf46ef301817ea67c2f525451963" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/giorgiosironi/phpunit-selenium/zipball/343ba4e389ad97046c78fb2c7111e199795e7a80", - "reference": "343ba4e389ad97046c78fb2c7111e199795e7a80", + "url": "https://api.github.com/repos/giorgiosironi/phpunit-selenium/zipball/3129be3c3a90bf46ef301817ea67c2f525451963", + "reference": "3129be3c3a90bf46ef301817ea67c2f525451963", "shasum": "" }, "require": { "ext-curl": "*", - "ext-dom": "*", - "php": ">=5.6", - "phpunit/phpunit": "~5.0", - "sebastian/comparator": "~1.0" + "php": ">=7.1", + "phpunit/phpunit": ">=7.0,<8.0" }, "require-dev": { "phing/phing": "2.*" @@ -1565,6 +1612,14 @@ { "name": "Paul Briton", "role": "developer" + }, + { + "name": "Patrik Štrba", + "role": "developer" + }, + { + "name": "Petr Kotek", + "role": "developer" } ], "description": "Selenium Server integration for PHPUnit", @@ -1575,7 +1630,7 @@ "testing", "xunit" ], - "time": "2017-01-23T22:12:35+00:00" + "time": "2019-07-02T20:42:44+00:00" }, { "name": "roave/security-advisories", @@ -1583,12 +1638,12 @@ "source": { "type": "git", "url": "https://github.com/Roave/SecurityAdvisories.git", - "reference": "40fb2c205dd261ab6bb42ec29545934f0db7026f" + "reference": "e4ee2c8e4ccd908debc64069faf023c684a76760" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/40fb2c205dd261ab6bb42ec29545934f0db7026f", - "reference": "40fb2c205dd261ab6bb42ec29545934f0db7026f", + "url": "https://api.github.com/repos/Roave/SecurityAdvisories/zipball/e4ee2c8e4ccd908debc64069faf023c684a76760", + "reference": "e4ee2c8e4ccd908debc64069faf023c684a76760", "shasum": "" }, "conflict": { @@ -1691,7 +1746,7 @@ "silverstripe/userforms": "<3", "simple-updates/phpwhois": "<=1", "simplesamlphp/saml2": "<1.10.6|>=2,<2.3.8|>=3,<3.1.4", - "simplesamlphp/simplesamlphp": "<1.17.3", + "simplesamlphp/simplesamlphp": "<1.17.8", "simplesamlphp/simplesamlphp-module-infocard": "<1.0.1", "slim/slim": "<2.6", "smarty/smarty": "<3.1.33", @@ -1793,7 +1848,7 @@ } ], "description": "Prevents installation of composer packages with known security vulnerabilities: no API, simply require it", - "time": "2019-11-19T14:18:57+00:00" + "time": "2019-12-02T13:03:15+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -1842,30 +1897,30 @@ }, { "name": "sebastian/comparator", - "version": "1.2.4", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be" + "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", - "reference": "2b7424b55f5047b47ac6e5ccb20b2aea4011d9be", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/5de4fc177adf9bce8df98d8d141a7559d7ccf6da", + "reference": "5de4fc177adf9bce8df98d8d141a7559d7ccf6da", "shasum": "" }, "require": { - "php": ">=5.3.3", - "sebastian/diff": "~1.2", - "sebastian/exporter": "~1.2 || ~2.0" + "php": "^7.1", + "sebastian/diff": "^3.0", + "sebastian/exporter": "^3.1" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -1896,38 +1951,39 @@ } ], "description": "Provides the functionality to compare PHP values for equality", - "homepage": "http://www.github.com/sebastianbergmann/comparator", + "homepage": "https://github.com/sebastianbergmann/comparator", "keywords": [ "comparator", "compare", "equality" ], - "time": "2017-01-29T09:50:25+00:00" + "time": "2018-07-12T15:12:46+00:00" }, { "name": "sebastian/diff", - "version": "1.4.3", + "version": "3.0.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4" + "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/7f066a26a962dbe58ddea9f72a4e82874a3975a4", - "reference": "7f066a26a962dbe58ddea9f72a4e82874a3975a4", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/720fcc7e9b5cf384ea68d9d930d480907a0c1a29", + "reference": "720fcc7e9b5cf384ea68d9d930d480907a0c1a29", "shasum": "" }, "require": { - "php": "^5.3.3 || ^7.0" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.0" + "phpunit/phpunit": "^7.5 || ^8.0", + "symfony/process": "^2 || ^3.3 || ^4" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.4-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -1952,34 +2008,40 @@ "description": "Diff implementation", "homepage": "https://github.com/sebastianbergmann/diff", "keywords": [ - "diff" + "diff", + "udiff", + "unidiff", + "unified diff" ], - "time": "2017-05-22T07:24:03+00:00" + "time": "2019-02-04T06:01:07+00:00" }, { "name": "sebastian/environment", - "version": "2.0.0", + "version": "4.2.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac" + "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/5795ffe5dc5b02460c3e34222fee8cbe245d8fac", - "reference": "5795ffe5dc5b02460c3e34222fee8cbe245d8fac", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/464c90d7bdf5ad4e8a6aea15c091fec0603d4368", + "reference": "464c90d7bdf5ad4e8a6aea15c091fec0603d4368", "shasum": "" }, "require": { - "php": "^5.6 || ^7.0" + "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^5.0" + "phpunit/phpunit": "^7.5" + }, + "suggest": { + "ext-posix": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2004,34 +2066,34 @@ "environment", "hhvm" ], - "time": "2016-11-26T07:53:53+00:00" + "time": "2019-11-20T08:46:58+00:00" }, { "name": "sebastian/exporter", - "version": "2.0.0", + "version": "3.1.2", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4" + "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", - "reference": "ce474bdd1a34744d7ac5d6aad3a46d48d9bac4c4", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/68609e1261d215ea5b21b7987539cbfbe156ec3e", + "reference": "68609e1261d215ea5b21b7987539cbfbe156ec3e", "shasum": "" }, "require": { - "php": ">=5.3.3", - "sebastian/recursion-context": "~2.0" + "php": "^7.0", + "sebastian/recursion-context": "^3.0" }, "require-dev": { "ext-mbstring": "*", - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.1.x-dev" } }, "autoload": { @@ -2044,6 +2106,10 @@ "BSD-3-Clause" ], "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, { "name": "Jeff Welch", "email": "whatthejeff@gmail.com" @@ -2052,17 +2118,13 @@ "name": "Volker Dusch", "email": "github@wallbash.com" }, - { - "name": "Bernhard Schussek", - "email": "bschussek@2bepublished.at" - }, - { - "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de" - }, { "name": "Adam Harvey", "email": "aharvey@php.net" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@gmail.com" } ], "description": "Provides the functionality to export PHP variables for visualization", @@ -2071,27 +2133,27 @@ "export", "exporter" ], - "time": "2016-11-19T08:54:04+00:00" + "time": "2019-09-14T09:02:43+00:00" }, { "name": "sebastian/global-state", - "version": "1.1.1", + "version": "2.0.0", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/global-state.git", - "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", - "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", + "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.2" + "phpunit/phpunit": "^6.0" }, "suggest": { "ext-uopz": "*" @@ -2099,7 +2161,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -2122,33 +2184,34 @@ "keywords": [ "global state" ], - "time": "2015-10-12T03:26:01+00:00" + "time": "2017-04-27T15:39:26+00:00" }, { "name": "sebastian/object-enumerator", - "version": "2.0.1", + "version": "3.0.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7" + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/1311872ac850040a79c3c058bea3e22d0f09cbb7", - "reference": "1311872ac850040a79c3c058bea3e22d0f09cbb7", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5", + "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5", "shasum": "" }, "require": { - "php": ">=5.6", - "sebastian/recursion-context": "~2.0" + "php": "^7.0", + "sebastian/object-reflector": "^1.1.1", + "sebastian/recursion-context": "^3.0" }, "require-dev": { - "phpunit/phpunit": "~5" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "3.0.x-dev" } }, "autoload": { @@ -2168,32 +2231,77 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2017-02-18T15:18:39+00:00" + "time": "2017-08-03T12:35:26+00:00" }, { - "name": "sebastian/recursion-context", - "version": "2.0.0", + "name": "sebastian/object-reflector", + "version": "1.1.1", "source": { "type": "git", - "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a" + "url": "https://github.com/sebastianbergmann/object-reflector.git", + "reference": "773f97c67f28de00d397be301821b06708fca0be" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/2c3ba150cbec723aa057506e73a8d33bdb286c9a", - "reference": "2c3ba150cbec723aa057506e73a8d33bdb286c9a", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be", + "reference": "773f97c67f28de00d397be301821b06708fca0be", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": "^7.0" }, "require-dev": { - "phpunit/phpunit": "~4.4" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "1.1-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Allows reflection of object attributes, including inherited and non-public ones", + "homepage": "https://github.com/sebastianbergmann/object-reflector/", + "time": "2017-03-29T09:07:27+00:00" + }, + { + "name": "sebastian/recursion-context", + "version": "3.0.0", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", + "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8", + "shasum": "" + }, + "require": { + "php": "^7.0" + }, + "require-dev": { + "phpunit/phpunit": "^6.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0.x-dev" } }, "autoload": { @@ -2221,29 +2329,29 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2016-11-19T07:33:16+00:00" + "time": "2017-03-03T06:23:57+00:00" }, { "name": "sebastian/resource-operations", - "version": "1.0.0", + "version": "2.0.1", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52" + "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", - "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9", + "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9", "shasum": "" }, "require": { - "php": ">=5.6.0" + "php": "^7.1" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "1.0.x-dev" + "dev-master": "2.0-dev" } }, "autoload": { @@ -2263,7 +2371,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2015-07-28T20:34:47+00:00" + "time": "2018-10-04T04:07:39+00:00" }, { "name": "sebastian/version", @@ -2310,16 +2418,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.12.0", + "version": "v1.13.1", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "550ebaac289296ce228a706d0867afc34687e3f4" + "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/550ebaac289296ce228a706d0867afc34687e3f4", - "reference": "550ebaac289296ce228a706d0867afc34687e3f4", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", + "reference": "f8f0b461be3385e56d6de3dbb5a0df24c0c275e3", "shasum": "" }, "require": { @@ -2331,7 +2439,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } }, "autoload": { @@ -2364,7 +2472,7 @@ "polyfill", "portable" ], - "time": "2019-08-06T08:03:45+00:00" + "time": "2019-11-27T13:56:44+00:00" }, { "name": "symfony/stopwatch", @@ -2474,32 +2582,70 @@ "time": "2017-12-11T20:38:23+00:00" }, { - "name": "webmozart/assert", - "version": "1.5.0", + "name": "theseer/tokenizer", + "version": "1.1.3", "source": { "type": "git", - "url": "https://github.com/webmozart/assert.git", - "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4" + "url": "https://github.com/theseer/tokenizer.git", + "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/88e6d84706d09a236046d686bbea96f07b3a34f4", - "reference": "88e6d84706d09a236046d686bbea96f07b3a34f4", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9", + "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-tokenizer": "*", + "ext-xmlwriter": "*", + "php": "^7.0" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Arne Blankerts", + "email": "arne@blankerts.de", + "role": "Developer" + } + ], + "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", + "time": "2019-06-13T22:48:21+00:00" + }, + { + "name": "webmozart/assert", + "version": "1.6.0", + "source": { + "type": "git", + "url": "https://github.com/webmozart/assert.git", + "reference": "573381c0a64f155a0d9a23f4b0c797194805b925" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/webmozart/assert/zipball/573381c0a64f155a0d9a23f4b0c797194805b925", + "reference": "573381c0a64f155a0d9a23f4b0c797194805b925", "shasum": "" }, "require": { "php": "^5.3.3 || ^7.0", "symfony/polyfill-ctype": "^1.8" }, + "conflict": { + "vimeo/psalm": "<3.6.0" + }, "require-dev": { "phpunit/phpunit": "^4.8.36 || ^7.5.13" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.3-dev" - } - }, "autoload": { "psr-4": { "Webmozart\\Assert\\": "src/" @@ -2521,7 +2667,7 @@ "check", "validate" ], - "time": "2019-08-24T08:43:50+00:00" + "time": "2019-11-24T13:36:37+00:00" } ], "aliases": [], @@ -2532,7 +2678,7 @@ "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=5.6.0", + "php": ">=7.2.0", "ext-simplexml": "*", "ext-dom": "*", "ext-xml": "*", diff --git a/libs/jsonrpc/tests/ClientTest.php b/libs/jsonrpc/tests/ClientTest.php index d1f838778..cec9ad39a 100644 --- a/libs/jsonrpc/tests/ClientTest.php +++ b/libs/jsonrpc/tests/ClientTest.php @@ -77,7 +77,7 @@ class ClientTest extends PHPUnit_Framework_TestCase ), ))); - $this->setExpectedException('BadFunctionCallException'); + $this->expectException('BadFunctionCallException'); $client->execute('methodA', array('a' => 'b')); } diff --git a/libs/jsonrpc/tests/HttpClientTest.php b/libs/jsonrpc/tests/HttpClientTest.php index 71e6c8d05..d4e3734da 100644 --- a/libs/jsonrpc/tests/HttpClientTest.php +++ b/libs/jsonrpc/tests/HttpClientTest.php @@ -64,7 +64,7 @@ class HttpClientTest extends \PHPUnit_Framework_TestCase public function testWithServerError() { - $this->setExpectedException('\JsonRPC\Exception\ServerErrorException'); + $this->expectException('\JsonRPC\Exception\ServerErrorException'); $httpClient = new HttpClient(); $httpClient->handleExceptions(array( @@ -76,7 +76,7 @@ class HttpClientTest extends \PHPUnit_Framework_TestCase public function testWithConnectionFailure() { - $this->setExpectedException('\JsonRPC\Exception\ConnectionFailureException'); + $this->expectException('\JsonRPC\Exception\ConnectionFailureException'); $httpClient = new HttpClient(); $httpClient->handleExceptions(array( @@ -86,7 +86,7 @@ class HttpClientTest extends \PHPUnit_Framework_TestCase public function testWithAccessForbidden() { - $this->setExpectedException('\JsonRPC\Exception\AccessDeniedException'); + $this->expectException('\JsonRPC\Exception\AccessDeniedException'); $httpClient = new HttpClient(); $httpClient->handleExceptions(array( @@ -96,7 +96,7 @@ class HttpClientTest extends \PHPUnit_Framework_TestCase public function testWithAccessNotAllowed() { - $this->setExpectedException('\JsonRPC\Exception\AccessDeniedException'); + $this->expectException('\JsonRPC\Exception\AccessDeniedException'); $httpClient = new HttpClient(); $httpClient->handleExceptions(array( @@ -149,7 +149,7 @@ class HttpClientTest extends \PHPUnit_Framework_TestCase $client->withHeaders(array('Content-Length: '.strlen($payload))); }); - $this->setExpectedException('\JsonRPC\Exception\ConnectionFailureException'); + $this->expectException('\JsonRPC\Exception\ConnectionFailureException'); $httpClient->execute('test'); } @@ -214,7 +214,7 @@ class HttpClientTest extends \PHPUnit_Framework_TestCase }); - $this->setExpectedException('\JsonRPC\Exception\ConnectionFailureException'); + $this->expectException('\JsonRPC\Exception\ConnectionFailureException'); $httpClient->execute('test'); } } diff --git a/libs/jsonrpc/tests/MiddlewareHandlerTest.php b/libs/jsonrpc/tests/MiddlewareHandlerTest.php index be70cbf78..2f1876200 100644 --- a/libs/jsonrpc/tests/MiddlewareHandlerTest.php +++ b/libs/jsonrpc/tests/MiddlewareHandlerTest.php @@ -27,7 +27,7 @@ class MiddlewareHandlerTest extends PHPUnit_Framework_TestCase { public function testMiddlewareCanRaiseException() { - $this->setExpectedException('JsonRpc\Exception\AuthenticationFailureException'); + $this->expectException('JsonRpc\Exception\AuthenticationFailureException'); $middlewareHandler = new MiddlewareHandler(); $middlewareHandler->withUsername('myUsername'); diff --git a/libs/jsonrpc/tests/ProcedureHandlerTest.php b/libs/jsonrpc/tests/ProcedureHandlerTest.php index 983016c52..1e6f5c057 100644 --- a/libs/jsonrpc/tests/ProcedureHandlerTest.php +++ b/libs/jsonrpc/tests/ProcedureHandlerTest.php @@ -39,14 +39,14 @@ class ProcedureHandlerTest extends PHPUnit_Framework_TestCase { public function testProcedureNotFound() { - $this->setExpectedException('BadFunctionCallException'); + $this->expectException('BadFunctionCallException'); $handler = new ProcedureHandler; $handler->executeProcedure('a'); } public function testCallbackNotFound() { - $this->setExpectedException('BadFunctionCallException'); + $this->expectException('BadFunctionCallException'); $handler = new ProcedureHandler; $handler->withCallback('b', function() {}); $handler->executeProcedure('a'); @@ -54,7 +54,7 @@ class ProcedureHandlerTest extends PHPUnit_Framework_TestCase public function testClassNotFound() { - $this->setExpectedException('BadFunctionCallException'); + $this->expectException('BadFunctionCallException'); $handler = new ProcedureHandler; $handler->withClassAndMethod('getAllTasks', 'c', 'getAll'); $handler->executeProcedure('getAllTasks'); @@ -62,7 +62,7 @@ class ProcedureHandlerTest extends PHPUnit_Framework_TestCase public function testMethodNotFound() { - $this->setExpectedException('BadFunctionCallException'); + $this->expectException('BadFunctionCallException'); $handler = new ProcedureHandler; $handler->withClassAndMethod('getAllTasks', 'A', 'getNothing'); $handler->executeProcedure('getAllTasks'); @@ -127,7 +127,7 @@ class ProcedureHandlerTest extends PHPUnit_Framework_TestCase public function testTooManyArguments() { - $this->setExpectedException('InvalidArgumentException'); + $this->expectException('InvalidArgumentException'); $handler = new ProcedureHandler; $handler->withClassAndMethod('getAllC', new B, 'getAll'); @@ -136,7 +136,7 @@ class ProcedureHandlerTest extends PHPUnit_Framework_TestCase public function testNotEnoughArguments() { - $this->setExpectedException('InvalidArgumentException'); + $this->expectException('InvalidArgumentException'); $handler = new ProcedureHandler; $handler->withClassAndMethod('getAllC', new B, 'getAll'); diff --git a/libs/jsonrpc/tests/Response/ResponseParserTest.php b/libs/jsonrpc/tests/Response/ResponseParserTest.php index f195014fb..99cced996 100644 --- a/libs/jsonrpc/tests/Response/ResponseParserTest.php +++ b/libs/jsonrpc/tests/Response/ResponseParserTest.php @@ -17,7 +17,7 @@ class ResponseParserTest extends PHPUnit_Framework_TestCase public function testWithBadJsonFormat() { - $this->setExpectedException('\JsonRPC\Exception\InvalidJsonFormatException'); + $this->expectException('\JsonRPC\Exception\InvalidJsonFormatException'); ResponseParser::create() ->withPayload('foobar') @@ -26,7 +26,7 @@ class ResponseParserTest extends PHPUnit_Framework_TestCase public function testWithBadProcedure() { - $this->setExpectedException('BadFunctionCallException'); + $this->expectException('BadFunctionCallException'); ResponseParser::create() ->withPayload(json_decode('{"jsonrpc": "2.0", "error": {"code": -32601, "message": "Method not found"}, "id": "1"}', true)) @@ -35,7 +35,7 @@ class ResponseParserTest extends PHPUnit_Framework_TestCase public function testWithInvalidArgs() { - $this->setExpectedException('InvalidArgumentException'); + $this->expectException('InvalidArgumentException'); ResponseParser::create() ->withPayload(json_decode('{"jsonrpc": "2.0", "error": {"code": -32602, "message": "Invalid params"}, "id": "1"}', true)) @@ -44,7 +44,7 @@ class ResponseParserTest extends PHPUnit_Framework_TestCase public function testWithInvalidRequest() { - $this->setExpectedException('\JsonRPC\Exception\InvalidJsonRpcFormatException'); + $this->expectException('\JsonRPC\Exception\InvalidJsonRpcFormatException'); ResponseParser::create() ->withPayload(json_decode('{"jsonrpc": "2.0", "error": {"code": -32600, "message": "Invalid Request"}, "id": null}', true)) @@ -53,7 +53,7 @@ class ResponseParserTest extends PHPUnit_Framework_TestCase public function testWithParseError() { - $this->setExpectedException('\JsonRPC\Exception\InvalidJsonFormatException'); + $this->expectException('\JsonRPC\Exception\InvalidJsonFormatException'); ResponseParser::create() ->withPayload(json_decode('{"jsonrpc": "2.0", "error": {"code": -32700, "message": "Parse error"}, "id": null}', true)) @@ -62,7 +62,7 @@ class ResponseParserTest extends PHPUnit_Framework_TestCase public function testWithOtherError() { - $this->setExpectedException('\JsonRPC\Exception\ResponseException'); + $this->expectException('\JsonRPC\Exception\ResponseException'); ResponseParser::create() ->withPayload(json_decode('{"jsonrpc": "2.0", "error": {"code": 42, "message": "Something", "data": "foobar"}, "id": null}', true)) @@ -91,7 +91,7 @@ class ResponseParserTest extends PHPUnit_Framework_TestCase {"jsonrpc": "2.0", "error": {"code": -32602, "message": "Invalid params"}, "id": "1"} ]'; - $this->setExpectedException('InvalidArgumentException'); + $this->expectException('InvalidArgumentException'); ResponseParser::create() ->withPayload(json_decode($payload, true)) diff --git a/libs/jsonrpc/tests/ServerTest.php b/libs/jsonrpc/tests/ServerTest.php index 87f37c2d5..7e6c73f2b 100644 --- a/libs/jsonrpc/tests/ServerTest.php +++ b/libs/jsonrpc/tests/ServerTest.php @@ -222,7 +222,7 @@ class ServerTest extends HeaderMockTest throw new MyException('test'); }); - $this->setExpectedException('MyException'); + $this->expectException('MyException'); $server->execute(); } diff --git a/libs/jsonrpc/tests/Validator/HostValidatorTest.php b/libs/jsonrpc/tests/Validator/HostValidatorTest.php index a5fed7e05..4c94ad8a0 100644 --- a/libs/jsonrpc/tests/Validator/HostValidatorTest.php +++ b/libs/jsonrpc/tests/Validator/HostValidatorTest.php @@ -20,13 +20,13 @@ class HostValidatorTest extends PHPUnit_Framework_TestCase { $this->assertNull(HostValidator::validate(array('192.168.10.1/24'), '192.168.10.1'),'test ip match'); $this->assertNull(HostValidator::validate(array('192.168.10.1/24'), '192.168.10.250'),'test ip match'); - $this->setExpectedException('\JsonRPC\Exception\AccessDeniedException'); + $this->expectException('\JsonRPC\Exception\AccessDeniedException'); HostValidator::validate(array('192.168.10.1/24'), '192.168.11.1'); } public function testWithNotAuthorizedHosts() { - $this->setExpectedException('\JsonRPC\Exception\AccessDeniedException'); + $this->expectException('\JsonRPC\Exception\AccessDeniedException'); HostValidator::validate(array('192.168.1.1'), '127.0.0.1', '127.0.0.1'); } } diff --git a/libs/jsonrpc/tests/Validator/JsonEncodingValidatorTest.php b/libs/jsonrpc/tests/Validator/JsonEncodingValidatorTest.php index a1b2b80e6..12f41204a 100644 --- a/libs/jsonrpc/tests/Validator/JsonEncodingValidatorTest.php +++ b/libs/jsonrpc/tests/Validator/JsonEncodingValidatorTest.php @@ -16,7 +16,7 @@ class JsonEncodingValidatorTest extends PHPUnit_Framework_TestCase { json_encode("\xB1\x31"); - $this->setExpectedException('\JsonRPC\Exception\ResponseEncodingFailureException'); + $this->expectException('\JsonRPC\Exception\ResponseEncodingFailureException'); JsonEncodingValidator::validate(); } } diff --git a/libs/jsonrpc/tests/Validator/JsonFormatValidatorTest.php b/libs/jsonrpc/tests/Validator/JsonFormatValidatorTest.php index a838ada90..43fcaff76 100644 --- a/libs/jsonrpc/tests/Validator/JsonFormatValidatorTest.php +++ b/libs/jsonrpc/tests/Validator/JsonFormatValidatorTest.php @@ -13,7 +13,7 @@ class JsonFormatValidatorTest extends PHPUnit_Framework_TestCase public function testJsonNotParsedCorrectly() { - $this->setExpectedException('\JsonRPC\Exception\InvalidJsonFormatException'); + $this->expectException('\JsonRPC\Exception\InvalidJsonFormatException'); JsonFormatValidator::validate(''); } } diff --git a/libs/jsonrpc/tests/Validator/RpcFormatValidatorTest.php b/libs/jsonrpc/tests/Validator/RpcFormatValidatorTest.php index 3e6ba8bc0..9f78b8df9 100644 --- a/libs/jsonrpc/tests/Validator/RpcFormatValidatorTest.php +++ b/libs/jsonrpc/tests/Validator/RpcFormatValidatorTest.php @@ -13,31 +13,31 @@ class RpcFormatValidatorTest extends PHPUnit_Framework_TestCase public function testWithNoVersion() { - $this->setExpectedException('\JsonRPC\Exception\InvalidJsonRpcFormatException'); + $this->expectException('\JsonRPC\Exception\InvalidJsonRpcFormatException'); RpcFormatValidator::validate(array('method' => 'foobar')); } public function testWithNoMethod() { - $this->setExpectedException('\JsonRPC\Exception\InvalidJsonRpcFormatException'); + $this->expectException('\JsonRPC\Exception\InvalidJsonRpcFormatException'); RpcFormatValidator::validate(array('jsonrpc' => '2.0')); } public function testWithMethodNotString() { - $this->setExpectedException('\JsonRPC\Exception\InvalidJsonRpcFormatException'); + $this->expectException('\JsonRPC\Exception\InvalidJsonRpcFormatException'); RpcFormatValidator::validate(array('jsonrpc' => '2.0', 'method' => array())); } public function testWithBadVersion() { - $this->setExpectedException('\JsonRPC\Exception\InvalidJsonRpcFormatException'); + $this->expectException('\JsonRPC\Exception\InvalidJsonRpcFormatException'); RpcFormatValidator::validate(array('jsonrpc' => '1.0', 'method' => 'abc')); } public function testWithBadParams() { - $this->setExpectedException('\JsonRPC\Exception\InvalidJsonRpcFormatException'); + $this->expectException('\JsonRPC\Exception\InvalidJsonRpcFormatException'); RpcFormatValidator::validate(array('jsonrpc' => '2.0', 'method' => 'abc', 'params' => 'foobar')); } diff --git a/libs/jsonrpc/tests/Validator/UserValidatorTest.php b/libs/jsonrpc/tests/Validator/UserValidatorTest.php index e514c105a..dc795d349 100644 --- a/libs/jsonrpc/tests/Validator/UserValidatorTest.php +++ b/libs/jsonrpc/tests/Validator/UserValidatorTest.php @@ -18,7 +18,7 @@ class UserValidatorTest extends PHPUnit_Framework_TestCase public function testWithNotAuthorizedHosts() { - $this->setExpectedException('\JsonRPC\Exception\AuthenticationFailureException'); + $this->expectException('\JsonRPC\Exception\AuthenticationFailureException'); UserValidator::validate(array('user' => 'pass'), 'user', 'wrong password'); } } diff --git a/tests/configtest/DefaultConfigFileTest.php b/tests/configtest/DefaultConfigFileTest.php index 0840925b5..ee4485899 100644 --- a/tests/configtest/DefaultConfigFileTest.php +++ b/tests/configtest/DefaultConfigFileTest.php @@ -1,6 +1,6 @@ setExpectedException('JsonRPC\Exception\AccessDeniedException'); + $this->expectException('JsonRPC\Exception\AccessDeniedException'); $this->app->getMe(); } public function testUserCredentialDoNotHaveAccessToAdminProcedures() { - $this->setExpectedException('JsonRPC\Exception\AccessDeniedException'); + $this->expectException('JsonRPC\Exception\AccessDeniedException'); $this->user->getUser(1); } public function testManagerCredentialDoNotHaveAccessToAdminProcedures() { - $this->setExpectedException('JsonRPC\Exception\AccessDeniedException'); + $this->expectException('JsonRPC\Exception\AccessDeniedException'); $this->user->getAllProjects(); } public function testUserCredentialDoNotHaveAccessToManagerProcedures() { - $this->setExpectedException('JsonRPC\Exception\AccessDeniedException'); + $this->expectException('JsonRPC\Exception\AccessDeniedException'); $this->user->createProject('Team project creation are only for app managers'); } @@ -38,7 +38,7 @@ class ProcedureAuthorizationTest extends BaseProcedureTest $projectId = $this->admin->createProject('Team project created by admin'); $this->assertNotFalse($projectId); - $this->setExpectedException('JsonRPC\Exception\AccessDeniedException'); + $this->expectException('JsonRPC\Exception\AccessDeniedException'); $this->assertNotNull($this->manager->getProjectById($projectId)); } @@ -61,7 +61,7 @@ class ProcedureAuthorizationTest extends BaseProcedureTest $projectId = $this->manager->createProject('A team project without members'); $this->assertNotFalse($projectId); - $this->setExpectedException('JsonRPC\Exception\AccessDeniedException'); + $this->expectException('JsonRPC\Exception\AccessDeniedException'); $this->user->getProjectById($projectId); } @@ -90,7 +90,7 @@ class ProcedureAuthorizationTest extends BaseProcedureTest $actionId = $this->manager->createAction($projectId, 'task.move.column', '\Kanboard\Action\TaskCloseColumn', array('column_id' => 1)); $this->assertNotFalse($actionId); - $this->setExpectedException('JsonRPC\Exception\AccessDeniedException'); + $this->expectException('JsonRPC\Exception\AccessDeniedException'); $this->user->removeAction($projectId); } @@ -108,7 +108,7 @@ class ProcedureAuthorizationTest extends BaseProcedureTest $this->assertTrue($this->manager->addProjectUser($projectId, $this->userUserId, 'project-member')); - $this->setExpectedException('JsonRPC\Exception\AccessDeniedException'); + $this->expectException('JsonRPC\Exception\AccessDeniedException'); $this->user->removeAction($actionId); } @@ -140,7 +140,7 @@ class ProcedureAuthorizationTest extends BaseProcedureTest $categoryId = $this->manager->createCategory($projectId, 'Test'); $this->assertNotFalse($categoryId); - $this->setExpectedException('JsonRPC\Exception\AccessDeniedException'); + $this->expectException('JsonRPC\Exception\AccessDeniedException'); $this->user->removeCategory($categoryId); } @@ -157,7 +157,7 @@ class ProcedureAuthorizationTest extends BaseProcedureTest $this->assertNotFalse($categoryId); $this->assertTrue($this->manager->addProjectUser($projectId, $this->userUserId, 'project-member')); - $this->setExpectedException('JsonRPC\Exception\AccessDeniedException'); + $this->expectException('JsonRPC\Exception\AccessDeniedException'); $this->user->removeCategory($categoryId); } @@ -189,7 +189,7 @@ class ProcedureAuthorizationTest extends BaseProcedureTest $columnId = $this->manager->addColumn($projectId, 'Test'); $this->assertNotFalse($columnId); - $this->setExpectedException('JsonRPC\Exception\AccessDeniedException'); + $this->expectException('JsonRPC\Exception\AccessDeniedException'); $this->user->removeColumn($columnId); } @@ -206,7 +206,7 @@ class ProcedureAuthorizationTest extends BaseProcedureTest $this->assertNotFalse($columnId); $this->assertTrue($this->manager->addProjectUser($projectId, $this->userUserId, 'project-member')); - $this->setExpectedException('JsonRPC\Exception\AccessDeniedException'); + $this->expectException('JsonRPC\Exception\AccessDeniedException'); $this->user->removeColumn($columnId); } @@ -242,7 +242,7 @@ class ProcedureAuthorizationTest extends BaseProcedureTest $commentId = $this->manager->createComment($taskId, $this->userUserId, 'My comment'); $this->assertNotFalse($commentId); - $this->setExpectedException('JsonRPC\Exception\AccessDeniedException'); + $this->expectException('JsonRPC\Exception\AccessDeniedException'); $this->user->updateComment($commentId, 'something else'); } @@ -281,7 +281,7 @@ class ProcedureAuthorizationTest extends BaseProcedureTest $subtaskId = $this->manager->createSubtask($taskId, 'My subtask'); $this->assertNotFalse($subtaskId); - $this->setExpectedException('JsonRPC\Exception\AccessDeniedException'); + $this->expectException('JsonRPC\Exception\AccessDeniedException'); $this->user->removeSubtask($subtaskId); } diff --git a/tests/units/Base.php b/tests/units/Base.php index 42f842788..e746d45f0 100644 --- a/tests/units/Base.php +++ b/tests/units/Base.php @@ -11,7 +11,7 @@ use Kanboard\Core\Log\Logger; use Kanboard\Core\Session\FlashMessage; use Kanboard\ServiceProvider\ActionProvider; -abstract class Base extends PHPUnit_Framework_TestCase +abstract class Base extends PHPUnit\Framework\TestCase { protected $container; diff --git a/tests/units/Core/Action/ActionManagerTest.php b/tests/units/Core/Action/ActionManagerTest.php index cf6a88d40..36e5f9336 100644 --- a/tests/units/Core/Action/ActionManagerTest.php +++ b/tests/units/Core/Action/ActionManagerTest.php @@ -26,7 +26,7 @@ class ActionManagerTest extends Base public function testGetActionNotFound() { - $this->setExpectedException('RuntimeException', 'Automatic Action Not Found: foobar'); + $this->expectException('RuntimeException', 'Automatic Action Not Found: foobar'); $actionManager = new ActionManager($this->container); $actionManager->getAction('foobar'); } diff --git a/tests/units/Core/ExternalLink/ExternalLinkManagerTest.php b/tests/units/Core/ExternalLink/ExternalLinkManagerTest.php index d284a80b3..096646d54 100644 --- a/tests/units/Core/ExternalLink/ExternalLinkManagerTest.php +++ b/tests/units/Core/ExternalLink/ExternalLinkManagerTest.php @@ -25,7 +25,7 @@ class ExternalLinkManagerTest extends Base { $externalLinkManager = new ExternalLinkManager($this->container); - $this->setExpectedException('\Kanboard\Core\ExternalLink\ExternalLinkProviderNotFound'); + $this->expectException('\Kanboard\Core\ExternalLink\ExternalLinkProviderNotFound'); $externalLinkManager->getProvider('not found'); } @@ -68,7 +68,7 @@ class ExternalLinkManagerTest extends Base $externalLinkManager->register($webLinkProvider); $externalLinkManager->register($attachmentLinkProvider); - $this->setExpectedException('\Kanboard\Core\ExternalLink\ExternalLinkProviderNotFound'); + $this->expectException('\Kanboard\Core\ExternalLink\ExternalLinkProviderNotFound'); $externalLinkManager->find(); } @@ -113,7 +113,7 @@ class ExternalLinkManagerTest extends Base $externalLinkManager->register($webLinkProvider); $externalLinkManager->register($attachmentLinkProvider); - $this->setExpectedException('\Kanboard\Core\ExternalLink\ExternalLinkProviderNotFound'); + $this->expectException('\Kanboard\Core\ExternalLink\ExternalLinkProviderNotFound'); $externalLinkManager->setUserInput(array('text' => 'https://google.com/', 'type' => 'not found')); $externalLinkManager->find(); } diff --git a/tests/units/Core/ExternalTask/ExternalTaskManagerTest.php b/tests/units/Core/ExternalTask/ExternalTaskManagerTest.php index 76f12ad4d..7cbba62cc 100644 --- a/tests/units/Core/ExternalTask/ExternalTaskManagerTest.php +++ b/tests/units/Core/ExternalTask/ExternalTaskManagerTest.php @@ -8,7 +8,7 @@ class ExternalTaskManagerTest extends Base { public function testProviderNotFound() { - $this->setExpectedException('Kanboard\Core\ExternalTask\ProviderNotFoundException'); + $this->expectException('Kanboard\Core\ExternalTask\ProviderNotFoundException'); $manager = new ExternalTaskManager(); $manager->getProvider('foobar'); diff --git a/tests/units/Core/Ldap/ClientTest.php b/tests/units/Core/Ldap/ClientTest.php index 9f007c28e..761ec0d70 100644 --- a/tests/units/Core/Ldap/ClientTest.php +++ b/tests/units/Core/Ldap/ClientTest.php @@ -68,7 +68,7 @@ class ClientTest extends \Base public function testGetLdapServerNotConfigured() { - $this->setExpectedException('\LogicException'); + $this->expectException('\LogicException'); $ldap = new Client; $ldap->getLdapServer(); } @@ -100,7 +100,7 @@ class ClientTest extends \Base ) ->will($this->returnValue(false)); - $this->setExpectedException('\Kanboard\Core\Ldap\ConnectionException'); + $this->expectException('\Kanboard\Core\Ldap\ConnectionException'); $ldap = new Client; $ldap->open('my_ldap_server'); @@ -150,7 +150,7 @@ class ClientTest extends \Base ) ->will($this->returnValue(false)); - $this->setExpectedException('\Kanboard\Core\Ldap\ConnectionException'); + $this->expectException('\Kanboard\Core\Ldap\ConnectionException'); $ldap = new Client; $ldap->open('my_ldap_server', 389, true); @@ -175,7 +175,7 @@ class ClientTest extends \Base ->method('ldap_bind') ->will($this->returnValue(false)); - $this->setExpectedException('\Kanboard\Core\Ldap\ClientException'); + $this->expectException('\Kanboard\Core\Ldap\ClientException'); $ldap = new Client; $ldap->useAnonymousAuthentication(); @@ -228,7 +228,7 @@ class ClientTest extends \Base ) ->will($this->returnValue(false)); - $this->setExpectedException('\Kanboard\Core\Ldap\ClientException'); + $this->expectException('\Kanboard\Core\Ldap\ClientException'); $ldap = new Client; $ldap->open('my_ldap_server'); diff --git a/tests/units/Core/Ldap/LdapGroupTest.php b/tests/units/Core/Ldap/LdapGroupTest.php index 4341ffc83..295a20e6b 100644 --- a/tests/units/Core/Ldap/LdapGroupTest.php +++ b/tests/units/Core/Ldap/LdapGroupTest.php @@ -151,7 +151,7 @@ class LdapGroupTest extends Base public function testGetBaseDnNotConfigured() { - $this->setExpectedException('\LogicException'); + $this->expectException('\LogicException'); $group = new Group($this->query); $group->getBasDn(); diff --git a/tests/units/Core/Ldap/LdapUserTest.php b/tests/units/Core/Ldap/LdapUserTest.php index 335a699bb..64e306b54 100644 --- a/tests/units/Core/Ldap/LdapUserTest.php +++ b/tests/units/Core/Ldap/LdapUserTest.php @@ -787,7 +787,7 @@ class LdapUserTest extends Base public function testGetBaseDnNotConfigured() { - $this->setExpectedException('\LogicException'); + $this->expectException('\LogicException'); $user = new User($this->query); $user->getBasDn(); @@ -795,7 +795,7 @@ class LdapUserTest extends Base public function testGetLdapUserPatternNotConfigured() { - $this->setExpectedException('\LogicException'); + $this->expectException('\LogicException'); $user = new User($this->query); $user->getLdapUserPattern('test'); diff --git a/tests/units/Core/Security/AuthenticationManagerTest.php b/tests/units/Core/Security/AuthenticationManagerTest.php index 616b7fa81..3869a87f0 100644 --- a/tests/units/Core/Security/AuthenticationManagerTest.php +++ b/tests/units/Core/Security/AuthenticationManagerTest.php @@ -22,14 +22,14 @@ class AuthenticationManagerTest extends Base public function testGetProviderNotFound() { $authManager = new AuthenticationManager($this->container); - $this->setExpectedException('LogicException'); + $this->expectException('LogicException'); $authManager->getProvider('Dababase'); } public function testGetPostProviderNotFound() { $authManager = new AuthenticationManager($this->container); - $this->setExpectedException('LogicException'); + $this->expectException('LogicException'); $authManager->getPostAuthenticationProvider(); } diff --git a/tests/units/Group/LdapBackendGroupProviderTest.php b/tests/units/Group/LdapBackendGroupProviderTest.php index 67b5ef351..a891ba7b7 100644 --- a/tests/units/Group/LdapBackendGroupProviderTest.php +++ b/tests/units/Group/LdapBackendGroupProviderTest.php @@ -8,7 +8,7 @@ class LdapBackendGroupProviderTest extends Base { public function testGetLdapGroupPattern() { - $this->setExpectedException('LogicException', 'LDAP group filter empty, check the parameter LDAP_GROUP_FILTER'); + $this->expectException('LogicException', 'LDAP group filter empty, check the parameter LDAP_GROUP_FILTER'); $backend = new LdapBackendGroupProvider($this->container); $backend->getLdapGroupPattern('test'); diff --git a/tests/units/Middleware/ApplicationAuthorizationMiddlewareTest.php b/tests/units/Middleware/ApplicationAuthorizationMiddlewareTest.php index 0a0c87839..482fbc2ac 100644 --- a/tests/units/Middleware/ApplicationAuthorizationMiddlewareTest.php +++ b/tests/units/Middleware/ApplicationAuthorizationMiddlewareTest.php @@ -45,7 +45,7 @@ class ApplicationAuthorizationMiddlewareMiddlewareTest extends Base ->expects($this->never()) ->method('execute'); - $this->setExpectedException('Kanboard\Core\Controller\AccessForbiddenException'); + $this->expectException('Kanboard\Core\Controller\AccessForbiddenException'); $this->middleware->execute(); } diff --git a/tests/units/Middleware/ProjectAuthorizationMiddlewareTest.php b/tests/units/Middleware/ProjectAuthorizationMiddlewareTest.php index 256f0a4d5..089bba895 100644 --- a/tests/units/Middleware/ProjectAuthorizationMiddlewareTest.php +++ b/tests/units/Middleware/ProjectAuthorizationMiddlewareTest.php @@ -56,7 +56,7 @@ class ProjectAuthorizationMiddlewareMiddlewareTest extends Base ->expects($this->never()) ->method('execute'); - $this->setExpectedException('Kanboard\Core\Controller\AccessForbiddenException'); + $this->expectException('Kanboard\Core\Controller\AccessForbiddenException'); $this->middleware->execute(); } diff --git a/tests/units/Model/UserModelTest.php b/tests/units/Model/UserModelTest.php index e7f6e0e56..5d39cdcc6 100644 --- a/tests/units/Model/UserModelTest.php +++ b/tests/units/Model/UserModelTest.php @@ -388,10 +388,10 @@ class UserModelTest extends Base $projectModel = new ProjectModel($this->container); $this->assertEquals(2, $userModel->create(array('username' => 'toto', 'password' => '123456', 'name' => 'Toto'))); - $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1', 'is_private' => 1, 'owner_id' => 2))); + $this->assertEquals(1, $projectModel->create(array('name' => 'Project #1', 'is_private' => 1), 2)); $this->assertTrue($userModel->disable(2)); - $project = $projectModel->getById(2); + $project = $projectModel->getById(1); $this->assertEquals(0, $project['is_active']); } } diff --git a/vendor/autoload.php b/vendor/autoload.php index f0391eef0..2390c7c12 100644 --- a/vendor/autoload.php +++ b/vendor/autoload.php @@ -4,4 +4,4 @@ require_once __DIR__ . '/composer/autoload_real.php'; -return ComposerAutoloaderInitbdc3716ceecc7570f8ff9a8407f0ca0e::getLoader(); +return ComposerAutoloaderInit094f3eabe2924332bc2198a9ba245f27::getLoader(); diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php index 7fbc96570..1a7dc0500 100644 --- a/vendor/composer/autoload_real.php +++ b/vendor/composer/autoload_real.php @@ -2,7 +2,7 @@ // autoload_real.php @generated by Composer -class ComposerAutoloaderInitbdc3716ceecc7570f8ff9a8407f0ca0e +class ComposerAutoloaderInit094f3eabe2924332bc2198a9ba245f27 { private static $loader; @@ -19,15 +19,15 @@ class ComposerAutoloaderInitbdc3716ceecc7570f8ff9a8407f0ca0e return self::$loader; } - spl_autoload_register(array('ComposerAutoloaderInitbdc3716ceecc7570f8ff9a8407f0ca0e', 'loadClassLoader'), true, true); + spl_autoload_register(array('ComposerAutoloaderInit094f3eabe2924332bc2198a9ba245f27', 'loadClassLoader'), true, true); self::$loader = $loader = new \Composer\Autoload\ClassLoader(); - spl_autoload_unregister(array('ComposerAutoloaderInitbdc3716ceecc7570f8ff9a8407f0ca0e', 'loadClassLoader')); + spl_autoload_unregister(array('ComposerAutoloaderInit094f3eabe2924332bc2198a9ba245f27', 'loadClassLoader')); $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded()); if ($useStaticLoader) { require_once __DIR__ . '/autoload_static.php'; - call_user_func(\Composer\Autoload\ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e::getInitializer($loader)); + call_user_func(\Composer\Autoload\ComposerStaticInit094f3eabe2924332bc2198a9ba245f27::getInitializer($loader)); } else { $map = require __DIR__ . '/autoload_namespaces.php'; foreach ($map as $namespace => $path) { @@ -48,19 +48,19 @@ class ComposerAutoloaderInitbdc3716ceecc7570f8ff9a8407f0ca0e $loader->register(true); if ($useStaticLoader) { - $includeFiles = Composer\Autoload\ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e::$files; + $includeFiles = Composer\Autoload\ComposerStaticInit094f3eabe2924332bc2198a9ba245f27::$files; } else { $includeFiles = require __DIR__ . '/autoload_files.php'; } foreach ($includeFiles as $fileIdentifier => $file) { - composerRequirebdc3716ceecc7570f8ff9a8407f0ca0e($fileIdentifier, $file); + composerRequire094f3eabe2924332bc2198a9ba245f27($fileIdentifier, $file); } return $loader; } } -function composerRequirebdc3716ceecc7570f8ff9a8407f0ca0e($fileIdentifier, $file) +function composerRequire094f3eabe2924332bc2198a9ba245f27($fileIdentifier, $file) { if (empty($GLOBALS['__composer_autoload_files'][$fileIdentifier])) { require $file; diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 86fc5191a..29982b7b3 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e +class ComposerStaticInit094f3eabe2924332bc2198a9ba245f27 { public static $files = array ( '0e6d7bf4a5811bfa5cf40c5ccd6fae6a' => __DIR__ . '/..' . '/symfony/polyfill-mbstring/bootstrap.php', @@ -1082,11 +1082,11 @@ class ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e::$prefixDirsPsr4; - $loader->prefixesPsr0 = ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e::$prefixesPsr0; - $loader->fallbackDirsPsr0 = ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e::$fallbackDirsPsr0; - $loader->classMap = ComposerStaticInitbdc3716ceecc7570f8ff9a8407f0ca0e::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit094f3eabe2924332bc2198a9ba245f27::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit094f3eabe2924332bc2198a9ba245f27::$prefixDirsPsr4; + $loader->prefixesPsr0 = ComposerStaticInit094f3eabe2924332bc2198a9ba245f27::$prefixesPsr0; + $loader->fallbackDirsPsr0 = ComposerStaticInit094f3eabe2924332bc2198a9ba245f27::$fallbackDirsPsr0; + $loader->classMap = ComposerStaticInit094f3eabe2924332bc2198a9ba245f27::$classMap; }, null, ClassLoader::class); } diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json index 09da13cc7..182aa0ecb 100644 --- a/vendor/composer/installed.json +++ b/vendor/composer/installed.json @@ -772,17 +772,17 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.12.0", - "version_normalized": "1.12.0.0", + "version": "v1.13.1", + "version_normalized": "1.13.1.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17" + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/b42a2f66e8f1b15ccf25652c3424265923eb4f17", - "reference": "b42a2f66e8f1b15ccf25652c3424265923eb4f17", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/7b4aab9743c30be783b73de055d24a39cf4b954f", + "reference": "7b4aab9743c30be783b73de055d24a39cf4b954f", "shasum": "" }, "require": { @@ -791,11 +791,11 @@ "suggest": { "ext-mbstring": "For best performance" }, - "time": "2019-08-06T08:03:45+00:00", + "time": "2019-11-27T14:18:11+00:00", "type": "library", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } }, "installation-source": "dist", diff --git a/vendor/paragonie/random_compat/build-phar.sh b/vendor/paragonie/random_compat/build-phar.sh old mode 100755 new mode 100644 diff --git a/vendor/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php b/vendor/swiftmailer/swiftmailer/lib/swiftmailer_generate_mimes_config.php old mode 100755 new mode 100644 diff --git a/vendor/symfony/polyfill-mbstring/Mbstring.php b/vendor/symfony/polyfill-mbstring/Mbstring.php index 1fc4feea7..bf882ba26 100644 --- a/vendor/symfony/polyfill-mbstring/Mbstring.php +++ b/vendor/symfony/polyfill-mbstring/Mbstring.php @@ -512,7 +512,9 @@ final class Mbstring $offset = 0; } elseif ($offset = (int) $offset) { if ($offset < 0) { - $haystack = self::mb_substr($haystack, 0, $offset, $encoding); + if (0 > $offset += self::mb_strlen($needle)) { + $haystack = self::mb_substr($haystack, 0, $offset, $encoding); + } $offset = 0; } else { $haystack = self::mb_substr($haystack, $offset, 2147483647, $encoding); @@ -532,7 +534,7 @@ final class Mbstring return null; } - if ($split_length < 1) { + if (1 > $split_length = (int) $split_length) { trigger_error('The length of each segment must be greater than zero', E_USER_WARNING); return false; @@ -542,6 +544,10 @@ final class Mbstring $encoding = mb_internal_encoding(); } + if ('UTF-8' === $encoding = self::getEncoding($encoding)) { + return preg_split("/(.{{$split_length}})/u", $string, null, PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_NO_EMPTY); + } + $result = array(); $length = mb_strlen($string, $encoding); @@ -815,11 +821,16 @@ final class Mbstring return self::$internalEncoding; } + if ('UTF-8' === $encoding) { + return 'UTF-8'; + } + $encoding = strtoupper($encoding); if ('8BIT' === $encoding || 'BINARY' === $encoding) { return 'CP850'; } + if ('UTF8' === $encoding) { return 'UTF-8'; } diff --git a/vendor/symfony/polyfill-mbstring/composer.json b/vendor/symfony/polyfill-mbstring/composer.json index 308f009a1..c96807433 100644 --- a/vendor/symfony/polyfill-mbstring/composer.json +++ b/vendor/symfony/polyfill-mbstring/composer.json @@ -28,7 +28,7 @@ "minimum-stability": "dev", "extra": { "branch-alias": { - "dev-master": "1.12-dev" + "dev-master": "1.13-dev" } } }