diff --git a/bot.php b/bot.php index aa4ec3a..21db8ff 100755 --- a/bot.php +++ b/bot.php @@ -17,9 +17,11 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ - -require_once ("vendor/autoload.php"); +require "vendor/autoload.php"; use Symfony\Component\Yaml\Yaml; +use Oreolek\Game; +use Oreolek\Source; +use Oreolek\Publisher; use Revolution\Mastodon\MastodonClient; use \GuzzleHttp\Client as GuzzleClient; use Mremi\UrlShortener\Provider\Bitly\BitlyProvider; @@ -29,15 +31,6 @@ $config = Yaml::parse(file_get_contents('config.yml')); define('STYLE',$config['STYLE']); define('FORMAT',$config['FORMAT']); -require_once "Game.php"; -require_once "Source.php"; -require_once "Publisher.php"; -require_once "_download.php"; - -$loader = new \Aura\Autoload\Loader; -$loader->register(); -$loader->addPrefix('Source', 'Source'); -$loader->addPrefix('Publisher', 'Publisher'); $mastodon = new Publisher\Mastodon($config); $jabber = new Publisher\Jabber($config); $telegram = new Publisher\Telegram($config); diff --git a/composer.json b/composer.json index d38694c..82d3ba2 100644 --- a/composer.json +++ b/composer.json @@ -1,7 +1,6 @@ { "minimum-stability": "dev", "require": { - "aura/autoload": "^2.0", "sabre/xml": "^2.0", "addwiki/mediawiki-api": "^0.7.2", "symfony/dom-crawler": "^4.0", @@ -18,5 +17,10 @@ }, "scripts": { "test": "./vendor/bin/phpunit" + }, + "autoload": { + "psr-4": { + "Oreolek\\": "src/" + } } } diff --git a/composer.lock b/composer.lock index 5a68d10..ee6f3b0 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "831d194251719ea05dde96898c071ffa", + "content-hash": "154f53171626b4b89b12f05e1df1e581", "packages": [ { "name": "addwiki/mediawiki-api", @@ -12,12 +12,12 @@ "source": { "type": "git", "url": "https://github.com/addwiki/mediawiki-api.git", - "reference": "4e20606b7ee63fd77916579835f49a9b86973275" + "reference": "7a356d9a3a629f30f09dea16119f66030cb85921" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/addwiki/mediawiki-api/zipball/4e20606b7ee63fd77916579835f49a9b86973275", - "reference": "4e20606b7ee63fd77916579835f49a9b86973275", + "url": "https://api.github.com/repos/addwiki/mediawiki-api/zipball/7a356d9a3a629f30f09dea16119f66030cb85921", + "reference": "7a356d9a3a629f30f09dea16119f66030cb85921", "shasum": "" }, "require": { @@ -54,7 +54,7 @@ "keywords": [ "mediawiki" ], - "time": "2019-03-28T09:53:28+00:00" + "time": "2019-04-06T05:08:17+00:00" }, { "name": "addwiki/mediawiki-api-base", @@ -155,55 +155,6 @@ ], "time": "2018-01-10T19:14:13+00:00" }, - { - "name": "aura/autoload", - "version": "2.x-dev", - "source": { - "type": "git", - "url": "https://github.com/auraphp/Aura.Autoload.git", - "reference": "306a7f8d3cb58fb6f94bcff1dddf20c543f68668" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/auraphp/Aura.Autoload/zipball/306a7f8d3cb58fb6f94bcff1dddf20c543f68668", - "reference": "306a7f8d3cb58fb6f94bcff1dddf20c543f68668", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "aura": { - "type": "library" - } - }, - "autoload": { - "psr-4": { - "Aura\\Autoload\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "BSD-2-Clause" - ], - "authors": [ - { - "name": "Aura.Autoload Contributors", - "homepage": "https://github.com/auraphp/Aura.Autoload/contributors" - } - ], - "description": "Provides a PSR-4 compliant autoloader implementation.", - "homepage": "https://github.com/auraphp/Aura.Autoload", - "keywords": [ - "PSR-4", - "SPL autoloader", - "autoload", - "autoloader", - "class loader" - ], - "time": "2016-10-03T19:36:19+00:00" - }, { "name": "cocur/slugify", "version": "3.2.x-dev", @@ -343,12 +294,12 @@ "source": { "type": "git", "url": "https://github.com/guzzle/guzzle.git", - "reference": "bf595424e4d442a190582e088985dc835a789071" + "reference": "ca2892a8c2778c1821899fd2c79932e3b895f2ad" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/guzzle/zipball/bf595424e4d442a190582e088985dc835a789071", - "reference": "bf595424e4d442a190582e088985dc835a789071", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/ca2892a8c2778c1821899fd2c79932e3b895f2ad", + "reference": "ca2892a8c2778c1821899fd2c79932e3b895f2ad", "shasum": "" }, "require": { @@ -401,7 +352,7 @@ "rest", "web service" ], - "time": "2019-04-15T08:22:37+00:00" + "time": "2019-05-12T12:35:22+00:00" }, { "name": "guzzlehttp/promises", @@ -409,19 +360,19 @@ "source": { "type": "git", "url": "https://github.com/guzzle/promises.git", - "reference": "926eaa3ff73cde2becf652b785831bcb7618568a" + "reference": "17d36ed176c998839582c739ce0753381598edf0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/promises/zipball/926eaa3ff73cde2becf652b785831bcb7618568a", - "reference": "926eaa3ff73cde2becf652b785831bcb7618568a", + "url": "https://api.github.com/repos/guzzle/promises/zipball/17d36ed176c998839582c739ce0753381598edf0", + "reference": "17d36ed176c998839582c739ce0753381598edf0", "shasum": "" }, "require": { - "php": ">=5.5.0" + "php": ">=5.6" }, "require-dev": { - "phpunit/phpunit": "^4.8.36" + "phpunit/phpunit": "^5.7.27 || ^7.5" }, "type": "library", "extra": { @@ -452,20 +403,20 @@ "keywords": [ "promise" ], - "time": "2018-10-30T00:20:04+00:00" + "time": "2019-07-02T14:54:06+00:00" }, { "name": "guzzlehttp/psr7", - "version": "dev-master", + "version": "1.x-dev", "source": { "type": "git", "url": "https://github.com/guzzle/psr7.git", - "reference": "a346647434953deb5bd599d92922b2d225e25170" + "reference": "239400de7a173fe9901b9ac7c06497751f00727a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/psr7/zipball/a346647434953deb5bd599d92922b2d225e25170", - "reference": "a346647434953deb5bd599d92922b2d225e25170", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/239400de7a173fe9901b9ac7c06497751f00727a", + "reference": "239400de7a173fe9901b9ac7c06497751f00727a", "shasum": "" }, "require": { @@ -486,7 +437,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.5-dev" + "dev-master": "1.6-dev" } }, "autoload": { @@ -523,7 +474,7 @@ "uri", "url" ], - "time": "2019-04-01T06:40:32+00:00" + "time": "2019-07-01T23:21:34+00:00" }, { "name": "illuminate/contracts", @@ -531,12 +482,12 @@ "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "3381911b08c93b55b5a30fd1cdf552089a5e78b6" + "reference": "924686e905185884a56dc870faaca01eba57487c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/3381911b08c93b55b5a30fd1cdf552089a5e78b6", - "reference": "3381911b08c93b55b5a30fd1cdf552089a5e78b6", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/924686e905185884a56dc870faaca01eba57487c", + "reference": "924686e905185884a56dc870faaca01eba57487c", "shasum": "" }, "require": { @@ -567,7 +518,7 @@ ], "description": "The Illuminate Contracts package.", "homepage": "https://laravel.com", - "time": "2019-04-04T16:27:35+00:00" + "time": "2019-07-19T22:08:43+00:00" }, { "name": "illuminate/support", @@ -575,12 +526,12 @@ "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "55f69a0f296f166c0490c9dea4704e2efef2c177" + "reference": "6d9784697c96d69f2ccff84355e2c0c10f70979c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/55f69a0f296f166c0490c9dea4704e2efef2c177", - "reference": "55f69a0f296f166c0490c9dea4704e2efef2c177", + "url": "https://api.github.com/repos/illuminate/support/zipball/6d9784697c96d69f2ccff84355e2c0c10f70979c", + "reference": "6d9784697c96d69f2ccff84355e2c0c10f70979c", "shasum": "" }, "require": { @@ -588,7 +539,7 @@ "ext-json": "*", "ext-mbstring": "*", "illuminate/contracts": "5.9.*", - "nesbot/carbon": "^1.26.3 || ^2.0", + "nesbot/carbon": "^2.0", "php": "^7.2" }, "conflict": { @@ -598,9 +549,9 @@ "illuminate/filesystem": "Required to use the composer class (5.9.*).", "moontoast/math": "Required to use ordered UUIDs (^1.1).", "ramsey/uuid": "Required to use Str::uuid() (^3.7).", - "symfony/process": "Required to use the composer class (^4.2).", - "symfony/var-dumper": "Required to use the dd function (^4.2).", - "vlucas/phpdotenv": "Required to use the env helper (^3.3)." + "symfony/process": "Required to use the composer class (^4.3).", + "symfony/var-dumper": "Required to use the dd function (^4.3).", + "vlucas/phpdotenv": "Required to use the Env class and env helper (^3.3)." }, "type": "library", "extra": { @@ -628,7 +579,7 @@ ], "description": "The Illuminate Support package.", "homepage": "https://laravel.com", - "time": "2019-04-11T14:22:55+00:00" + "time": "2019-07-25T14:11:41+00:00" }, { "name": "jaxl/jaxl", @@ -709,12 +660,12 @@ "source": { "type": "git", "url": "https://github.com/php-telegram-bot/core.git", - "reference": "695e63a7916204643f151b120cfbabfbcf66d0bc" + "reference": "f55fd1c2eb75b4f8e9ab468066ce96acba9e6b68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-telegram-bot/core/zipball/695e63a7916204643f151b120cfbabfbcf66d0bc", - "reference": "695e63a7916204643f151b120cfbabfbcf66d0bc", + "url": "https://api.github.com/repos/php-telegram-bot/core/zipball/f55fd1c2eb75b4f8e9ab468066ce96acba9e6b68", + "reference": "f55fd1c2eb75b4f8e9ab468066ce96acba9e6b68", "shasum": "" }, "require": { @@ -724,10 +675,11 @@ "ext-pdo": "*", "guzzlehttp/guzzle": "^6.3", "monolog/monolog": "^1.24", - "php": "^5.5|^7.0" + "php": "^5.5|^7.0", + "psr/log": "^1.1" }, "require-dev": { - "phpunit/phpunit": "^4.8|^5.7|^6.5|^7.4|^8.1", + "phpunit/phpunit": "^4.8|^5.7|^6.5|^7.5|^8.1", "squizlabs/php_codesniffer": "^3.4" }, "type": "library", @@ -760,7 +712,7 @@ "bot", "telegram" ], - "time": "2019-04-15T00:19:31+00:00" + "time": "2019-07-18T15:02:31+00:00" }, { "name": "monolog/monolog", @@ -768,12 +720,12 @@ "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "4d5b7e6ba1127789c7ff59d6f762298eaa29787f" + "reference": "17cbfb8b9ccf56c03a32cb72d4a5ec466961eaa3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/4d5b7e6ba1127789c7ff59d6f762298eaa29787f", - "reference": "4d5b7e6ba1127789c7ff59d6f762298eaa29787f", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/17cbfb8b9ccf56c03a32cb72d4a5ec466961eaa3", + "reference": "17cbfb8b9ccf56c03a32cb72d4a5ec466961eaa3", "shasum": "" }, "require": { @@ -838,74 +790,20 @@ "logging", "psr-3" ], - "time": "2018-12-26T14:24:03+00:00" - }, - { - "name": "mremi/url-shortener", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/mremi/UrlShortener.git", - "reference": "d814c07e27dedd359b865b27e8d01ed0f25b4a40" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/mremi/UrlShortener/zipball/d814c07e27dedd359b865b27e8d01ed0f25b4a40", - "reference": "d814c07e27dedd359b865b27e8d01ed0f25b4a40", - "shasum": "" - }, - "require": { - "guzzlehttp/guzzle": "^6.0", - "php": "^5.5 || ^7.0", - "symfony/console": "^2.7 || ^3.1 || ^4.1" - }, - "require-dev": { - "fabpot/php-cs-fixer": "~0.1 || ~1.0", - "phpunit/phpunit": "~4.8", - "symfony/phpunit-bridge": "~2.7 || ~3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.3-dev" - } - }, - "autoload": { - "psr-4": { - "Mremi\\UrlShortener\\": "src/Mremi/UrlShortener" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Rémi Marseille", - "email": "marseille.remi@gmail.com" - } - ], - "description": "A PHP5 library using API to shorten/expand URL", - "homepage": "https://github.com/mremi/UrlShortener", - "keywords": [ - "api", - "shortener", - "url" - ], - "time": "2018-10-15T07:04:05+00:00" + "time": "2019-07-06T13:03:00+00:00" }, { "name": "nesbot/carbon", - "version": "2.16.3", + "version": "2.22.0-beta.3", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "373d9f0d58651af366435148c39beb702c2b7ef4" + "reference": "1a0e48b5f656065ba3c265b058b25d36c2162a5e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/373d9f0d58651af366435148c39beb702c2b7ef4", - "reference": "373d9f0d58651af366435148c39beb702c2b7ef4", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/1a0e48b5f656065ba3c265b058b25d36c2162a5e", + "reference": "1a0e48b5f656065ba3c265b058b25d36c2162a5e", "shasum": "" }, "require": { @@ -915,12 +813,15 @@ }, "require-dev": { "friendsofphp/php-cs-fixer": "^2.14 || ^3.0", - "kylekatarnls/multi-tester": "^0.1", - "phpmd/phpmd": "^2.6", - "phpstan/phpstan": "^0.10.8", + "kylekatarnls/multi-tester": "^1.1", + "phpmd/phpmd": "dev-php-7.1-compatibility", + "phpstan/phpstan": "^0.11", "phpunit/phpunit": "^7.5 || ^8.0", "squizlabs/php_codesniffer": "^3.4" }, + "bin": [ + "bin/carbon" + ], "type": "library", "extra": { "laravel": { @@ -943,6 +844,10 @@ "name": "Brian Nesbitt", "email": "brian@nesbot.com", "homepage": "http://nesbot.com" + }, + { + "name": "kylekatarnls", + "homepage": "http://github.com/kylekatarnls" } ], "description": "A simple API extension for DateTime.", @@ -952,7 +857,7 @@ "datetime", "time" ], - "time": "2019-04-06T17:09:23+00:00" + "time": "2019-07-28T09:02:12+00:00" }, { "name": "psr/container", @@ -1194,18 +1099,18 @@ "source": { "type": "git", "url": "https://github.com/kawax/laravel-mastodon-api.git", - "reference": "df96b27b5cbd39751b4e1856da2a5bb133162e35" + "reference": "199bbde64b25d4df3a8c8da7afc9682aec8ce3ff" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kawax/laravel-mastodon-api/zipball/df96b27b5cbd39751b4e1856da2a5bb133162e35", - "reference": "df96b27b5cbd39751b4e1856da2a5bb133162e35", + "url": "https://api.github.com/repos/kawax/laravel-mastodon-api/zipball/199bbde64b25d4df3a8c8da7afc9682aec8ce3ff", + "reference": "199bbde64b25d4df3a8c8da7afc9682aec8ce3ff", "shasum": "" }, "require": { "ext-json": "*", "guzzlehttp/guzzle": "^6.2", - "illuminate/support": "^5.8", + "illuminate/support": "^5.8 || ^6.0", "php": ">=7.1.3" }, "require-dev": { @@ -1244,7 +1149,7 @@ "laravel", "mastodon" ], - "time": "2019-02-27T09:45:29+00:00" + "time": "2019-07-25T04:59:28+00:00" }, { "name": "ryakad/pandoc-php", @@ -1274,24 +1179,23 @@ }, { "name": "sabre/uri", - "version": "2.1.1", + "version": "2.1.2", "source": { "type": "git", "url": "https://github.com/sabre-io/uri.git", - "reference": "a42126042c7dcb53e2978dadb6d22574d1359b4c" + "reference": "c260a55cbd2083c03484f56f72fe042fee0c17ed" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sabre-io/uri/zipball/a42126042c7dcb53e2978dadb6d22574d1359b4c", - "reference": "a42126042c7dcb53e2978dadb6d22574d1359b4c", + "url": "https://api.github.com/repos/sabre-io/uri/zipball/c260a55cbd2083c03484f56f72fe042fee0c17ed", + "reference": "c260a55cbd2083c03484f56f72fe042fee0c17ed", "shasum": "" }, "require": { "php": ">=7" }, "require-dev": { - "phpunit/phpunit": "^6.0", - "sabre/cs": "~1.0.0" + "phpunit/phpunit": "^6" }, "type": "library", "autoload": { @@ -1321,7 +1225,7 @@ "uri", "url" ], - "time": "2017-02-20T20:02:35+00:00" + "time": "2019-06-25T05:34:33+00:00" }, { "name": "sabre/xml", @@ -1385,164 +1289,18 @@ ], "time": "2019-01-09T15:57:23+00:00" }, - { - "name": "symfony/console", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/symfony/console.git", - "reference": "47b78954bea981abeccfed88eef3a9a57c15ca4d" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/47b78954bea981abeccfed88eef3a9a57c15ca4d", - "reference": "47b78954bea981abeccfed88eef3a9a57c15ca4d", - "shasum": "" - }, - "require": { - "php": "^7.1.3", - "symfony/contracts": "^1.1", - "symfony/polyfill-mbstring": "~1.0", - "symfony/polyfill-php73": "^1.8" - }, - "conflict": { - "symfony/dependency-injection": "<3.4", - "symfony/event-dispatcher": "<4.3", - "symfony/process": "<3.3" - }, - "provide": { - "psr/log-implementation": "1.0" - }, - "require-dev": { - "psr/log": "~1.0", - "symfony/config": "~3.4|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/event-dispatcher": "^4.3", - "symfony/lock": "~3.4|~4.0", - "symfony/process": "~3.4|~4.0", - "symfony/var-dumper": "^4.3" - }, - "suggest": { - "psr/log": "For using the console logger", - "symfony/event-dispatcher": "", - "symfony/lock": "", - "symfony/process": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "4.3-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Component\\Console\\": "" - }, - "exclude-from-classmap": [ - "/Tests/" - ] - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" - }, - { - "name": "Symfony Community", - "homepage": "https://symfony.com/contributors" - } - ], - "description": "Symfony Console Component", - "homepage": "https://symfony.com", - "time": "2019-04-09T18:49:00+00:00" - }, - { - "name": "symfony/contracts", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/symfony/contracts.git", - "reference": "c96781d350bcf402f3ee578c4d9c7f0d2e1e4605" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/contracts/zipball/c96781d350bcf402f3ee578c4d9c7f0d2e1e4605", - "reference": "c96781d350bcf402f3ee578c4d9c7f0d2e1e4605", - "shasum": "" - }, - "require": { - "php": "^7.1.3" - }, - "require-dev": { - "psr/cache": "^1.0", - "psr/container": "^1.0", - "symfony/polyfill-intl-idn": "^1.10" - }, - "suggest": { - "psr/cache": "When using the Cache contracts", - "psr/container": "When using the Service contracts", - "symfony/cache-contracts-implementation": "", - "symfony/event-dispatcher-implementation": "", - "symfony/http-client-contracts-implementation": "", - "symfony/service-contracts-implementation": "", - "symfony/translation-contracts-implementation": "" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.1-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Contracts\\": "" - }, - "exclude-from-classmap": [ - "**/Tests/" - ] - }, - "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": "A set of abstractions extracted out of the Symfony components", - "homepage": "https://symfony.com", - "keywords": [ - "abstractions", - "contracts", - "decoupling", - "interfaces", - "interoperability", - "standards" - ], - "time": "2019-04-15T17:24:46+00:00" - }, { "name": "symfony/css-selector", - "version": "dev-master", + "version": "4.4.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/css-selector.git", - "reference": "105c98bb0c5d8635bea056135304bd8edcc42b4d" + "reference": "9ed158c52af88c6befa7dd00c8e6dfc273a52ab4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/css-selector/zipball/105c98bb0c5d8635bea056135304bd8edcc42b4d", - "reference": "105c98bb0c5d8635bea056135304bd8edcc42b4d", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/9ed158c52af88c6befa7dd00c8e6dfc273a52ab4", + "reference": "9ed158c52af88c6befa7dd00c8e6dfc273a52ab4", "shasum": "" }, "require": { @@ -1551,7 +1309,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1582,20 +1340,20 @@ ], "description": "Symfony CssSelector Component", "homepage": "https://symfony.com", - "time": "2019-01-16T21:53:39+00:00" + "time": "2019-05-09T07:23:25+00:00" }, { "name": "symfony/dom-crawler", - "version": "dev-master", + "version": "4.4.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/dom-crawler.git", - "reference": "a3709b7b83616653dfb7b50af64d5e3f6342c2df" + "reference": "3923e3068bec400ec2a65ab2a4be9bcea3b2df12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/a3709b7b83616653dfb7b50af64d5e3f6342c2df", - "reference": "a3709b7b83616653dfb7b50af64d5e3f6342c2df", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/3923e3068bec400ec2a65ab2a4be9bcea3b2df12", + "reference": "3923e3068bec400ec2a65ab2a4be9bcea3b2df12", "shasum": "" }, "require": { @@ -1608,7 +1366,7 @@ }, "require-dev": { "masterminds/html5": "^2.6", - "symfony/css-selector": "~3.4|~4.0" + "symfony/css-selector": "^3.4|^4.0|^5.0" }, "suggest": { "symfony/css-selector": "" @@ -1616,7 +1374,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1643,7 +1401,7 @@ ], "description": "Symfony DomCrawler Component", "homepage": "https://symfony.com", - "time": "2019-04-06T14:52:24+00:00" + "time": "2019-07-04T06:46:07+00:00" }, { "name": "symfony/polyfill-ctype", @@ -1762,82 +1520,24 @@ ], "time": "2019-02-06T07:57:58+00:00" }, - { - "name": "symfony/polyfill-php73", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/symfony/polyfill-php73.git", - "reference": "d1fb4abcc0c47be136208ad9d68bf59f1ee17abd" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/d1fb4abcc0c47be136208ad9d68bf59f1ee17abd", - "reference": "d1fb4abcc0c47be136208ad9d68bf59f1ee17abd", - "shasum": "" - }, - "require": { - "php": ">=5.3.3" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.11-dev" - } - }, - "autoload": { - "psr-4": { - "Symfony\\Polyfill\\Php73\\": "" - }, - "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 backporting some PHP 7.3+ features to lower PHP versions", - "homepage": "https://symfony.com", - "keywords": [ - "compatibility", - "polyfill", - "portable", - "shim" - ], - "time": "2019-02-06T07:57:58+00:00" - }, { "name": "symfony/translation", - "version": "dev-master", + "version": "4.4.x-dev", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "4537556f856196a0d1e8a916240d8692d8eefb7b" + "reference": "c5adfef935222e44dd6f5cdacce14239e9af5c38" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/4537556f856196a0d1e8a916240d8692d8eefb7b", - "reference": "4537556f856196a0d1e8a916240d8692d8eefb7b", + "url": "https://api.github.com/repos/symfony/translation/zipball/c5adfef935222e44dd6f5cdacce14239e9af5c38", + "reference": "c5adfef935222e44dd6f5cdacce14239e9af5c38", "shasum": "" }, "require": { "php": "^7.1.3", - "symfony/contracts": "^1.0.2", - "symfony/polyfill-mbstring": "~1.0" + "symfony/polyfill-mbstring": "~1.0", + "symfony/translation-contracts": "^1.1.2" }, "conflict": { "symfony/config": "<3.4", @@ -1845,18 +1545,19 @@ "symfony/yaml": "<3.4" }, "provide": { - "symfony/translation-contracts-implementation": "1.0" + "symfony/translation-implementation": "1.0" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.4|~4.0", - "symfony/console": "~3.4|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/http-kernel": "~3.4|~4.0", - "symfony/intl": "~3.4|~4.0", - "symfony/var-dumper": "~3.4|~4.0", - "symfony/yaml": "~3.4|~4.0" + "symfony/config": "^3.4|^4.0|^5.0", + "symfony/console": "^3.4|^4.0|^5.0", + "symfony/dependency-injection": "^3.4|^4.0|^5.0", + "symfony/finder": "~2.8|~3.0|~4.0|^5.0", + "symfony/http-kernel": "^3.4|^4.0|^5.0", + "symfony/intl": "^3.4|^4.0|^5.0", + "symfony/service-contracts": "^1.1.2", + "symfony/var-dumper": "^3.4|^4.0|^5.0", + "symfony/yaml": "^3.4|^4.0|^5.0" }, "suggest": { "psr/log-implementation": "To use logging capability in translator", @@ -1866,7 +1567,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1893,20 +1594,77 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2019-04-10T19:42:49+00:00" + "time": "2019-07-18T10:38:27+00:00" }, { - "name": "symfony/yaml", + "name": "symfony/translation-contracts", "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/symfony/yaml.git", - "reference": "c60ecf5ba842324433b46f58dc7afc4487dbab99" + "url": "https://github.com/symfony/translation-contracts.git", + "reference": "cb4b18ad7b92a26e83b65dde940fab78339e6f3c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/c60ecf5ba842324433b46f58dc7afc4487dbab99", - "reference": "c60ecf5ba842324433b46f58dc7afc4487dbab99", + "url": "https://api.github.com/repos/symfony/translation-contracts/zipball/cb4b18ad7b92a26e83b65dde940fab78339e6f3c", + "reference": "cb4b18ad7b92a26e83b65dde940fab78339e6f3c", + "shasum": "" + }, + "require": { + "php": "^7.1.3" + }, + "suggest": { + "symfony/translation-implementation": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Contracts\\Translation\\": "" + } + }, + "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": "Generic abstractions related to translation", + "homepage": "https://symfony.com", + "keywords": [ + "abstractions", + "contracts", + "decoupling", + "interfaces", + "interoperability", + "standards" + ], + "time": "2019-06-13T11:15:36+00:00" + }, + { + "name": "symfony/yaml", + "version": "4.4.x-dev", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "77ce7e0ca12ec0cbf13528cfee27570f1a4cb836" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/77ce7e0ca12ec0cbf13528cfee27570f1a4cb836", + "reference": "77ce7e0ca12ec0cbf13528cfee27570f1a4cb836", "shasum": "" }, "require": { @@ -1917,7 +1675,7 @@ "symfony/console": "<3.4" }, "require-dev": { - "symfony/console": "~3.4|~4.0" + "symfony/console": "^3.4|^4.0|^5.0" }, "suggest": { "symfony/console": "For validating YAML files using the lint command" @@ -1925,7 +1683,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.3-dev" + "dev-master": "4.4-dev" } }, "autoload": { @@ -1952,7 +1710,7 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2019-04-06T14:04:46+00:00" + "time": "2019-07-24T14:49:41+00:00" } ], "packages-dev": [ @@ -1962,12 +1720,12 @@ "source": { "type": "git", "url": "https://github.com/doctrine/instantiator.git", - "reference": "a2c590166b2133a4633738648b6b064edae0814a" + "reference": "7c71fc2932158d00f24f10635bf3b3b8b6ee5b68" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/instantiator/zipball/a2c590166b2133a4633738648b6b064edae0814a", - "reference": "a2c590166b2133a4633738648b6b064edae0814a", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/7c71fc2932158d00f24f10635bf3b3b8b6ee5b68", + "reference": "7c71fc2932158d00f24f10635bf3b3b8b6ee5b68", "shasum": "" }, "require": { @@ -2010,7 +1768,7 @@ "constructor", "instantiate" ], - "time": "2019-03-17T17:37:11+00:00" + "time": "2019-07-02T13:37:32+00:00" }, { "name": "myclabs/deep-copy", @@ -2066,19 +1824,23 @@ "source": { "type": "git", "url": "https://github.com/phar-io/manifest.git", - "reference": "7761fcacf03b4d4f16e7ccb606d4879ca431fcf4" + "reference": "8c8bd1bb1a22f311b1b4886662b989d0d02aab77" }, "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/8c8bd1bb1a22f311b1b4886662b989d0d02aab77", + "reference": "8c8bd1bb1a22f311b1b4886662b989d0d02aab77", "shasum": "" }, "require": { "ext-dom": "*", "ext-phar": "*", + "ext-xmlwriter": "*", "phar-io/version": "^2.0", - "php": "^5.6 || ^7.0" + "php": "^7.2" + }, + "require-dev": { + "phpunit/phpunit": "^8.2" }, "type": "library", "extra": { @@ -2113,7 +1875,7 @@ } ], "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)", - "time": "2018-07-08T19:23:20+00:00" + "time": "2019-07-09T12:18:04+00:00" }, { "name": "phar-io/version", @@ -2218,16 +1980,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "4.3.0", + "version": "4.3.1", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "94fd0001232e47129dd3504189fa1c7225010d08" + "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08", - "reference": "94fd0001232e47129dd3504189fa1c7225010d08", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c", + "reference": "bdd9f737ebc2a01c06ea7ff4308ec6697db9b53c", "shasum": "" }, "require": { @@ -2265,7 +2027,7 @@ } ], "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.", - "time": "2017-11-30T07:14:17+00:00" + "time": "2019-04-30T17:48:53+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -2320,12 +2082,12 @@ "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "7e272180527c34a97680de85eb5aba0847a664e0" + "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/7e272180527c34a97680de85eb5aba0847a664e0", - "reference": "7e272180527c34a97680de85eb5aba0847a664e0", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/1927e75f4ed19131ec9bcc3b002e07fb1173ee76", + "reference": "1927e75f4ed19131ec9bcc3b002e07fb1173ee76", "shasum": "" }, "require": { @@ -2375,7 +2137,7 @@ "spy", "stub" ], - "time": "2018-12-18T15:40:51+00:00" + "time": "2019-06-13T12:50:23+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2397,11 +2159,11 @@ "php": "^7.2", "phpunit/php-file-iterator": "^2.0.2", "phpunit/php-text-template": "^1.2.1", - "phpunit/php-token-stream": "^3.0.1", + "phpunit/php-token-stream": "^3.1.0", "sebastian/code-unit-reverse-lookup": "^1.0.1", - "sebastian/environment": "^4.1", + "sebastian/environment": "^4.2.2", "sebastian/version": "^2.0.1", - "theseer/tokenizer": "^1.1" + "theseer/tokenizer": "^1.1.3" }, "require-dev": { "phpunit/phpunit": "^7.4.4" @@ -2446,12 +2208,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-file-iterator.git", - "reference": "5e99c0ea25f1eb9bd4d7380499788302984dd77b" + "reference": "7f0f29702170e2786b2df813af970135765de6fc" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/5e99c0ea25f1eb9bd4d7380499788302984dd77b", - "reference": "5e99c0ea25f1eb9bd4d7380499788302984dd77b", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/7f0f29702170e2786b2df813af970135765de6fc", + "reference": "7f0f29702170e2786b2df813af970135765de6fc", "shasum": "" }, "require": { @@ -2488,7 +2250,7 @@ "filesystem", "iterator" ], - "time": "2019-02-11T12:49:18+00:00" + "time": "2019-07-02T07:44:20+00:00" }, { "name": "phpunit/php-text-template", @@ -2537,12 +2299,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-timer.git", - "reference": "eb9e39fb4c2034c31897cdb5f59498fc9126ddcc" + "reference": "37d2894f3650acccb6e57207e63eb9699c1a82a6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/eb9e39fb4c2034c31897cdb5f59498fc9126ddcc", - "reference": "eb9e39fb4c2034c31897cdb5f59498fc9126ddcc", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/37d2894f3650acccb6e57207e63eb9699c1a82a6", + "reference": "37d2894f3650acccb6e57207e63eb9699c1a82a6", "shasum": "" }, "require": { @@ -2578,7 +2340,7 @@ "keywords": [ "timer" ], - "time": "2019-02-20T14:16:29+00:00" + "time": "2019-07-02T07:42:03+00:00" }, { "name": "phpunit/php-token-stream", @@ -2586,12 +2348,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/php-token-stream.git", - "reference": "cca9f57a2c7bb3d1e294f2aae84083ffe83dfa92" + "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/cca9f57a2c7bb3d1e294f2aae84083ffe83dfa92", - "reference": "cca9f57a2c7bb3d1e294f2aae84083ffe83dfa92", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/e899757bb3df5ff6e95089132f32cd59aac2220a", + "reference": "e899757bb3df5ff6e95089132f32cd59aac2220a", "shasum": "" }, "require": { @@ -2604,7 +2366,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "3.1-dev" } }, "autoload": { @@ -2627,7 +2389,7 @@ "keywords": [ "tokenizer" ], - "time": "2019-02-11T12:50:48+00:00" + "time": "2019-07-25T05:29:42+00:00" }, { "name": "phpunit/phpunit", @@ -2635,12 +2397,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "6e388aa37e12564546a80c2ba3a431b704c4acb1" + "reference": "e11397fed729bfef7a9c76f7b193c27ad5710f6b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6e388aa37e12564546a80c2ba3a431b704c4acb1", - "reference": "6e388aa37e12564546a80c2ba3a431b704c4acb1", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/e11397fed729bfef7a9c76f7b193c27ad5710f6b", + "reference": "e11397fed729bfef7a9c76f7b193c27ad5710f6b", "shasum": "" }, "require": { @@ -2700,8 +2462,8 @@ "authors": [ { "name": "Sebastian Bergmann", - "email": "sebastian@phpunit.de", - "role": "lead" + "role": "lead", + "email": "sebastian@phpunit.de" } ], "description": "The PHP Unit Testing framework.", @@ -2711,7 +2473,7 @@ "testing", "xunit" ], - "time": "2019-04-09T18:32:10+00:00" + "time": "2019-07-27T05:00:17+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -2719,12 +2481,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git", - "reference": "383c44e104c1fd46ecc915f55145bd2831318747" + "reference": "5e860800beea5ea4c8590df866338c09c20d3a48" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/383c44e104c1fd46ecc915f55145bd2831318747", - "reference": "383c44e104c1fd46ecc915f55145bd2831318747", + "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/5e860800beea5ea4c8590df866338c09c20d3a48", + "reference": "5e860800beea5ea4c8590df866338c09c20d3a48", "shasum": "" }, "require": { @@ -2756,7 +2518,7 @@ ], "description": "Looks up which function or method a line of code belongs to", "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/", - "time": "2019-02-11T12:48:46+00:00" + "time": "2019-07-02T07:44:03+00:00" }, { "name": "sebastian/comparator", @@ -2764,12 +2526,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "17ef3ffcdab9194ad7a2715a9fb1235f1361a366" + "reference": "9a1267ac19ecd74163989bcb3e01c5c9587f9e3b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/17ef3ffcdab9194ad7a2715a9fb1235f1361a366", - "reference": "17ef3ffcdab9194ad7a2715a9fb1235f1361a366", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/9a1267ac19ecd74163989bcb3e01c5c9587f9e3b", + "reference": "9a1267ac19ecd74163989bcb3e01c5c9587f9e3b", "shasum": "" }, "require": { @@ -2820,7 +2582,7 @@ "compare", "equality" ], - "time": "2019-02-11T12:51:04+00:00" + "time": "2019-07-02T07:45:15+00:00" }, { "name": "sebastian/diff", @@ -2828,12 +2590,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/diff.git", - "reference": "d4193340fc9bebb17533e00bc82f61da28fe7125" + "reference": "d7e7810940c78f3343420f76adf92dc437b7a557" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/d4193340fc9bebb17533e00bc82f61da28fe7125", - "reference": "d4193340fc9bebb17533e00bc82f61da28fe7125", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/d7e7810940c78f3343420f76adf92dc437b7a557", + "reference": "d7e7810940c78f3343420f76adf92dc437b7a557", "shasum": "" }, "require": { @@ -2876,7 +2638,7 @@ "unidiff", "unified diff" ], - "time": "2019-02-11T12:50:35+00:00" + "time": "2019-07-02T07:43:30+00:00" }, { "name": "sebastian/environment", @@ -2884,12 +2646,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/environment.git", - "reference": "dbf7b0d103084622e8a5015452a2650dcb248758" + "reference": "1c91ab3fb351373cf86ead6006ea9daa8e4ce027" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/dbf7b0d103084622e8a5015452a2650dcb248758", - "reference": "dbf7b0d103084622e8a5015452a2650dcb248758", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/1c91ab3fb351373cf86ead6006ea9daa8e4ce027", + "reference": "1c91ab3fb351373cf86ead6006ea9daa8e4ce027", "shasum": "" }, "require": { @@ -2904,7 +2666,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.2-dev" } }, "autoload": { @@ -2929,7 +2691,7 @@ "environment", "hhvm" ], - "time": "2019-02-11T12:51:52+00:00" + "time": "2019-07-02T07:44:59+00:00" }, { "name": "sebastian/exporter", @@ -2937,12 +2699,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/exporter.git", - "reference": "8be786b3b65fbe706733d44a4b4a53d5391a4772" + "reference": "97cc7aeb5bbc21a59df4e4e9e976831fa1b41fbe" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/8be786b3b65fbe706733d44a4b4a53d5391a4772", - "reference": "8be786b3b65fbe706733d44a4b4a53d5391a4772", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/97cc7aeb5bbc21a59df4e4e9e976831fa1b41fbe", + "reference": "97cc7aeb5bbc21a59df4e4e9e976831fa1b41fbe", "shasum": "" }, "require": { @@ -2996,7 +2758,7 @@ "export", "exporter" ], - "time": "2019-02-11T12:49:46+00:00" + "time": "2019-07-02T07:44:27+00:00" }, { "name": "sebastian/global-state", @@ -3055,12 +2817,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-enumerator.git", - "reference": "41af86e2a7b06e7e364c81a705b1f7caf6110218" + "reference": "63e5a3e0881ebf28c9fbb2a2e12b77d373850c12" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/41af86e2a7b06e7e364c81a705b1f7caf6110218", - "reference": "41af86e2a7b06e7e364c81a705b1f7caf6110218", + "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/63e5a3e0881ebf28c9fbb2a2e12b77d373850c12", + "reference": "63e5a3e0881ebf28c9fbb2a2e12b77d373850c12", "shasum": "" }, "require": { @@ -3094,7 +2856,7 @@ ], "description": "Traverses array structures and object graphs to enumerate all referenced objects", "homepage": "https://github.com/sebastianbergmann/object-enumerator/", - "time": "2019-02-11T12:50:05+00:00" + "time": "2019-07-02T07:43:46+00:00" }, { "name": "sebastian/object-reflector", @@ -3102,12 +2864,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/object-reflector.git", - "reference": "fae17b5d19ab523c9e821e5559d27e4c8a5bdee1" + "reference": "3053ae3e6286fdf98769f18ec10894dbc6260a34" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/fae17b5d19ab523c9e821e5559d27e4c8a5bdee1", - "reference": "fae17b5d19ab523c9e821e5559d27e4c8a5bdee1", + "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/3053ae3e6286fdf98769f18ec10894dbc6260a34", + "reference": "3053ae3e6286fdf98769f18ec10894dbc6260a34", "shasum": "" }, "require": { @@ -3139,7 +2901,7 @@ ], "description": "Allows reflection of object attributes, including inherited and non-public ones", "homepage": "https://github.com/sebastianbergmann/object-reflector/", - "time": "2019-02-11T12:48:12+00:00" + "time": "2019-07-02T07:44:36+00:00" }, { "name": "sebastian/recursion-context", @@ -3147,12 +2909,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/recursion-context.git", - "reference": "87b0893f697db6d75943e26d50bf91c82796a371" + "reference": "a58220ae18565f6004bbe15321efc4470bfe02fd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/87b0893f697db6d75943e26d50bf91c82796a371", - "reference": "87b0893f697db6d75943e26d50bf91c82796a371", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/a58220ae18565f6004bbe15321efc4470bfe02fd", + "reference": "a58220ae18565f6004bbe15321efc4470bfe02fd", "shasum": "" }, "require": { @@ -3192,7 +2954,7 @@ ], "description": "Provides functionality to recursively process PHP variables", "homepage": "http://www.github.com/sebastianbergmann/recursion-context", - "time": "2019-02-11T12:48:28+00:00" + "time": "2019-07-02T07:43:54+00:00" }, { "name": "sebastian/resource-operations", @@ -3200,12 +2962,12 @@ "source": { "type": "git", "url": "https://github.com/sebastianbergmann/resource-operations.git", - "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9" + "reference": "d67fc89d3107c396d161411b620619f3e7a7c270" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/4d7a795d35b889bf80a0cc04e08d77cedfa917a9", - "reference": "4d7a795d35b889bf80a0cc04e08d77cedfa917a9", + "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/d67fc89d3107c396d161411b620619f3e7a7c270", + "reference": "d67fc89d3107c396d161411b620619f3e7a7c270", "shasum": "" }, "require": { @@ -3234,7 +2996,7 @@ ], "description": "Provides a list of PHP built-in functions that operate on resources", "homepage": "https://www.github.com/sebastianbergmann/resource-operations", - "time": "2018-10-04T04:07:39+00:00" + "time": "2019-07-02T07:42:50+00:00" }, { "name": "sebastian/version", @@ -3281,16 +3043,16 @@ }, { "name": "theseer/tokenizer", - "version": "1.1.2", + "version": "1.1.3", "source": { "type": "git", "url": "https://github.com/theseer/tokenizer.git", - "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8" + "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/theseer/tokenizer/zipball/1c42705be2b6c1de5904f8afacef5895cab44bf8", - "reference": "1c42705be2b6c1de5904f8afacef5895cab44bf8", + "url": "https://api.github.com/repos/theseer/tokenizer/zipball/11336f6f84e16a720dae9d8e6ed5019efa85a0f9", + "reference": "11336f6f84e16a720dae9d8e6ed5019efa85a0f9", "shasum": "" }, "require": { @@ -3317,7 +3079,7 @@ } ], "description": "A small library for converting tokenized PHP source code into XML and potentially other formats", - "time": "2019-04-04T09:56:43+00:00" + "time": "2019-06-13T22:48:21+00:00" }, { "name": "webmozart/assert", @@ -3375,7 +3137,6 @@ "minimum-stability": "dev", "stability-flags": { "longman/telegram-bot": 20, - "mremi/url-shortener": 20, "revolution/laravel-mastodon-api": 20, "symfony/yaml": 20, "jaxl/jaxl": 20, diff --git a/run.php b/run.php index b071597..b9cdcb2 100755 --- a/run.php +++ b/run.php @@ -17,17 +17,14 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -use Symfony\Component\Yaml\Yaml; - require "vendor/autoload.php"; -require "Game.php"; -require "Source.php"; +use Symfony\Component\Yaml\Yaml; +use Oreolek\Game; +use Oreolek\Source; + $config = Yaml::parse(file_get_contents('config.yml')); define('STYLE',$config['STYLE']); define('FORMAT',$config['FORMAT']); -$loader = new \Aura\Autoload\Loader; -$loader->register(); -$loader->addPrefix('Source', 'Source'); $parsers = 'all'; if (PHP_SAPI !== 'cli') { @@ -66,7 +63,7 @@ if ($parsers === 'all') { function check($classname, $command) { global $parsers; if (is_array($parsers) && in_array($command, $parsers)) { - $cname = 'Source\\'.$classname; + $cname = 'Oreolek\\Source\\'.$classname; (new $cname())->check(); } } diff --git a/_download.php b/src/Downloader.php similarity index 53% rename from _download.php rename to src/Downloader.php index 3257b38..0505d75 100644 --- a/_download.php +++ b/src/Downloader.php @@ -15,28 +15,31 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . -*/ + */ +namespace Oreolek; -function get_text($url) { - $curl = curl_init(); - curl_setopt_array($curl, array( - CURLOPT_RETURNTRANSFER => 1, - CURLOPT_URL => $url, - )); - $resp = curl_exec($curl); - curl_close($curl); - return $resp; -} - -function download($url, $outFile) { - $options = array( - CURLOPT_FILE => fopen($outFile, 'w'), - CURLOPT_TIMEOUT => 28800, // set this to 8 hours so we dont timeout on big files - CURLOPT_URL => $url - ); - - $ch = curl_init(); - curl_setopt_array($ch, $options); - curl_exec($ch); - curl_close($ch); +class Downloader { + public static function get_text($url) { + $curl = curl_init(); + curl_setopt_array($curl, array( + CURLOPT_RETURNTRANSFER => 1, + CURLOPT_URL => $url, + )); + $resp = curl_exec($curl); + curl_close($curl); + return $resp; + } + + public static function download($url, $outFile) { + $options = array( + CURLOPT_FILE => fopen($outFile, 'w'), + CURLOPT_TIMEOUT => 28800, // set this to 8 hours so we dont timeout on big files + CURLOPT_URL => $url + ); + + $ch = curl_init(); + curl_setopt_array($ch, $options); + curl_exec($ch); + curl_close($ch); + } } diff --git a/Game.php b/src/Game.php similarity index 99% rename from Game.php rename to src/Game.php index 8f3f16d..59b3143 100644 --- a/Game.php +++ b/src/Game.php @@ -15,7 +15,9 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . -*/ + */ +namespace Oreolek; + use \Pandoc\Pandoc; class Game { diff --git a/Publisher.php b/src/Publisher.php similarity index 96% rename from Publisher.php rename to src/Publisher.php index 08d27f9..9525971 100644 --- a/Publisher.php +++ b/src/Publisher.php @@ -1,4 +1,6 @@ . */ -namespace Source; +namespace Oreolek; use \Symfony\Component\DomCrawler\Crawler; -use \Game; use \GuzzleHttp\Client as GuzzleClient; +use Game; abstract class Source { // Title diff --git a/Source/Anivisual.php b/src/Source/Anivisual.php similarity index 98% rename from Source/Anivisual.php rename to src/Source/Anivisual.php index daec304..1e4402a 100644 --- a/Source/Anivisual.php +++ b/src/Source/Anivisual.php @@ -16,9 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -namespace Source; +namespace Oreolek\Source; -use \Game; +use \Oreolek\Game; +use \Oreolek\Source; class Anivisual extends Source { public $title = "Anivisual"; diff --git a/Source/Apero.php b/src/Source/Apero.php similarity index 98% rename from Source/Apero.php rename to src/Source/Apero.php index d461047..bbc2659 100644 --- a/Source/Apero.php +++ b/src/Source/Apero.php @@ -16,9 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -namespace Source; +namespace Oreolek\Source; -use \Game; +use \Oreolek\Game; +use \Oreolek\Source; /** * Парсер для Apero.ru diff --git a/Source/Dashingdon.php b/src/Source/Dashingdon.php similarity index 94% rename from Source/Dashingdon.php rename to src/Source/Dashingdon.php index 832690f..fff519b 100644 --- a/Source/Dashingdon.php +++ b/src/Source/Dashingdon.php @@ -16,9 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -namespace Source; +namespace Oreolek\Source; -use \Game; +use \Oreolek\Game; +use \Oreolek\Source; /** * And here's the problem: there are no publication dates. diff --git a/Source/Gamejolt.php b/src/Source/Gamejolt.php similarity index 97% rename from Source/Gamejolt.php rename to src/Source/Gamejolt.php index 6b2dcb4..15c5412 100644 --- a/Source/Gamejolt.php +++ b/src/Source/Gamejolt.php @@ -16,9 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -namespace Source; +namespace Oreolek\Source; -use \Game; +use \Oreolek\Game; +use \Oreolek\Source; class Gamejolt extends Source { public $title = "GameJolt"; diff --git a/Source/Hyperbook.php b/src/Source/Hyperbook.php similarity index 98% rename from Source/Hyperbook.php rename to src/Source/Hyperbook.php index 7bf2a01..cd482fe 100644 --- a/Source/Hyperbook.php +++ b/src/Source/Hyperbook.php @@ -16,9 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -namespace Source; +namespace Oreolek\Source; -use \Game; +use \Oreolek\Game; +use \Oreolek\Source; class Hyperbook extends Source { public $title = "Гиперкнига"; diff --git a/Source/HyperbookEn.php b/src/Source/HyperbookEn.php similarity index 92% rename from Source/HyperbookEn.php rename to src/Source/HyperbookEn.php index 89c67e3..80d7d17 100644 --- a/Source/HyperbookEn.php +++ b/src/Source/HyperbookEn.php @@ -16,7 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -namespace Source; +namespace Oreolek\Source; + +use \Oreolek\Game; +use \Oreolek\Source; class HyperbookEn extends Hyperbook { public $title = "Гиперкнига"; diff --git a/Source/IFDB.php b/src/Source/IFDB.php similarity index 97% rename from Source/IFDB.php rename to src/Source/IFDB.php index 35e831c..646e7a5 100644 --- a/Source/IFDB.php +++ b/src/Source/IFDB.php @@ -16,9 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -namespace Source; +namespace Oreolek\Source; -use \Game; +use \Oreolek\Game; +use \Oreolek\Source; class IFDB extends Source { public $title = "IFDB"; diff --git a/Source/Instead.php b/src/Source/Instead.php similarity index 98% rename from Source/Instead.php rename to src/Source/Instead.php index 3b23aa5..ba92b7d 100644 --- a/Source/Instead.php +++ b/src/Source/Instead.php @@ -16,9 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -namespace Source; +namespace Oreolek\Source; -use \Game; +use \Oreolek\Game; +use \Oreolek\Source; class Instead extends Source { public $title = "INSTEAD репозиторий"; diff --git a/Source/Instory.php b/src/Source/Instory.php similarity index 98% rename from Source/Instory.php rename to src/Source/Instory.php index 8ba98a3..fba41ff 100644 --- a/Source/Instory.php +++ b/src/Source/Instory.php @@ -16,9 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -namespace Source; +namespace Oreolek\Source; -use \Game; +use \Oreolek\Game; +use \Oreolek\Source; class Instory extends Source { public $title = "Instory"; diff --git a/Source/Itch.php b/src/Source/Itch.php similarity index 98% rename from Source/Itch.php rename to src/Source/Itch.php index 456287c..cb7a516 100644 --- a/Source/Itch.php +++ b/src/Source/Itch.php @@ -16,9 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -namespace Source; +namespace Oreolek\Source; -use \Game; +use \Oreolek\Game; +use \Oreolek\Source; use \Pandoc\Pandoc; class Itch extends Source { diff --git a/Source/Kvester.php b/src/Source/Kvester.php similarity index 97% rename from Source/Kvester.php rename to src/Source/Kvester.php index 8b8d234..f4713c1 100644 --- a/Source/Kvester.php +++ b/src/Source/Kvester.php @@ -16,9 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -namespace Source; +namespace Oreolek\Source; -use \Game; +use \Oreolek\Game; +use \Oreolek\Source; class Kvester extends Source { public $title = "Квестер"; diff --git a/Source/Qsp.php b/src/Source/Qsp.php similarity index 97% rename from Source/Qsp.php rename to src/Source/Qsp.php index fa190da..a168ac0 100644 --- a/Source/Qsp.php +++ b/src/Source/Qsp.php @@ -16,9 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -namespace Source; +namespace Oreolek\Source; -use \Game; +use \Oreolek\Game; +use \Oreolek\Source; class Qsp extends Source { public $title = "Библиотека QSP"; diff --git a/Source/Questbook.php b/src/Source/Questbook.php similarity index 98% rename from Source/Questbook.php rename to src/Source/Questbook.php index 357bdf7..3886601 100644 --- a/Source/Questbook.php +++ b/src/Source/Questbook.php @@ -16,9 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -namespace Source; +namespace Oreolek\Source; -use \Game; +use \Oreolek\Game; +use \Oreolek\Source; class Questbook extends Source { public $title = "Сторигеймы"; diff --git a/Source/Steam.php b/src/Source/Steam.php similarity index 98% rename from Source/Steam.php rename to src/Source/Steam.php index 40ecf16..fccd3a2 100644 --- a/Source/Steam.php +++ b/src/Source/Steam.php @@ -16,9 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -namespace Source; +namespace Oreolek\Source; -use \Game; +use \Oreolek\Game; +use \Oreolek\Source; use \Symfony\Component\DomCrawler\Crawler; use \GuzzleHttp\Cookie\CookieJar; use \GuzzleHttp\Cookie\SetCookie; diff --git a/Source/Textadventures.php b/src/Source/Textadventures.php similarity index 96% rename from Source/Textadventures.php rename to src/Source/Textadventures.php index 12ce8fd..fba47fc 100644 --- a/Source/Textadventures.php +++ b/src/Source/Textadventures.php @@ -16,9 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -namespace Source; +namespace Oreolek\Source; -use \Game; +use \Oreolek\Game; +use \Oreolek\Source; use \Symfony\Component\DomCrawler\Crawler; class Textadventures extends Source { diff --git a/Source/Urq.php b/src/Source/Urq.php similarity index 96% rename from Source/Urq.php rename to src/Source/Urq.php index 14d877f..2896db0 100644 --- a/Source/Urq.php +++ b/src/Source/Urq.php @@ -16,9 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -namespace Source; +namespace Oreolek\Source; -use \Game; +use \Oreolek\Game; +use \Oreolek\Source; class Urq extends Source { public $title = "Библиотека URQ"; diff --git a/Source/VNDB.php b/src/Source/VNDB.php similarity index 95% rename from Source/VNDB.php rename to src/Source/VNDB.php index 89041e8..24960ba 100644 --- a/Source/VNDB.php +++ b/src/Source/VNDB.php @@ -16,9 +16,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -namespace Source; +namespace Oreolek\Source; -use \Game; +use \Oreolek\Game; +use \Oreolek\Source; class VNDB extends Source { public $title = "VNDB"; diff --git a/Wikipage.php b/src/Wikipage.php similarity index 99% rename from Wikipage.php rename to src/Wikipage.php index 13f7c18..8319a86 100644 --- a/Wikipage.php +++ b/src/Wikipage.php @@ -79,8 +79,8 @@ class Wikipage { ]); if (empty($pagetitle)) { echo 'ERROR: Page has no title.'; - var_dump($this->game); - die(); + print_r($this->game); + return; } $exists = $this->exists($pagetitle); if (!$config['DRY_RUN'] && !$exists) { diff --git a/wiki.php b/wiki.php index cada919..79fa1af 100755 --- a/wiki.php +++ b/wiki.php @@ -17,17 +17,13 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ -use Symfony\Component\Yaml\Yaml; - require "vendor/autoload.php"; -require "Game.php"; -require "Source.php"; -require "Wikipage.php"; -$config = Yaml::parse(file_get_contents('config.yml')); -$loader = new \Aura\Autoload\Loader; -$loader->register(); -$loader->addPrefix('Source', 'Source'); +use Symfony\Component\Yaml\Yaml; +use Oreolek\Game; +use Oreolek\Source; +use Oreolek\Wikipage; +$config = Yaml::parse(file_get_contents('config.yml')); if (!isset($argv[1])) { echo 'Please provide the direct URL to the game page.'.PHP_EOL; die();