From a187a767afb21777d67dbd1912a1d5dc389c9be2 Mon Sep 17 00:00:00 2001 From: Repflez Date: Tue, 15 May 2018 15:31:59 -0600 Subject: [PATCH 01/18] Update composer.lock --- composer.lock | 119 ++++++++++++++++++++++++-------------------------- 1 file changed, 58 insertions(+), 61 deletions(-) diff --git a/composer.lock b/composer.lock index cc6be78..838042c 100644 --- a/composer.lock +++ b/composer.lock @@ -8,16 +8,16 @@ "packages": [ { "name": "cloudinary/cloudinary_php", - "version": "1.8.0", + "version": "1.10.0", "source": { "type": "git", "url": "https://github.com/cloudinary/cloudinary_php.git", - "reference": "641b0901ca616c540b773abb802987a502aa8b89" + "reference": "aca317781ec1ad6614187a73dd0058026a02474e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cloudinary/cloudinary_php/zipball/641b0901ca616c540b773abb802987a502aa8b89", - "reference": "641b0901ca616c540b773abb802987a502aa8b89", + "url": "https://api.github.com/repos/cloudinary/cloudinary_php/zipball/aca317781ec1ad6614187a73dd0058026a02474e", + "reference": "aca317781ec1ad6614187a73dd0058026a02474e", "shasum": "" }, "require": { @@ -26,7 +26,7 @@ "php": ">=5.3.0" }, "require-dev": { - "phpunit/phpunit": "5.7.*" + "phpunit/phpunit": "4.8.*" }, "type": "library", "autoload": { @@ -56,7 +56,7 @@ "image management", "sdk" ], - "time": "2017-05-03T14:29:33+00:00" + "time": "2018-05-10T14:02:04+00:00" }, { "name": "doctrine/annotations", @@ -342,16 +342,16 @@ }, { "name": "doctrine/dbal", - "version": "v2.6.3", + "version": "v2.7.1", "source": { "type": "git", "url": "https://github.com/doctrine/dbal.git", - "reference": "e3eed9b1facbb0ced3a0995244843a189e7d1b13" + "reference": "11037b4352c008373561dc6fc836834eed80c3b5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/dbal/zipball/e3eed9b1facbb0ced3a0995244843a189e7d1b13", - "reference": "e3eed9b1facbb0ced3a0995244843a189e7d1b13", + "url": "https://api.github.com/repos/doctrine/dbal/zipball/11037b4352c008373561dc6fc836834eed80c3b5", + "reference": "11037b4352c008373561dc6fc836834eed80c3b5", "shasum": "" }, "require": { @@ -360,9 +360,11 @@ "php": "^7.1" }, "require-dev": { - "phpunit/phpunit": "^5.4.6", + "doctrine/coding-standard": "^4.0", + "phpunit/phpunit": "^7.0", "phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5", - "symfony/console": "2.*||^3.0" + "symfony/console": "^2.0.5||^3.0", + "symfony/phpunit-bridge": "^3.4.5|^4.0.5" }, "suggest": { "symfony/console": "For helpful console commands such as SQL execution and import of files." @@ -373,7 +375,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "2.6.x-dev" + "dev-master": "2.7.x-dev" } }, "autoload": { @@ -411,7 +413,7 @@ "persistence", "queryobject" ], - "time": "2017-11-19T13:38:54+00:00" + "time": "2018-04-07T18:44:18+00:00" }, { "name": "doctrine/inflector", @@ -856,20 +858,20 @@ }, { "name": "nesbot/carbon", - "version": "1.23.0", + "version": "1.27.0", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "4a874a39b2b00d7e0146cd46fab6f47c41ce9e65" + "reference": "ef81c39b67200dcd7401c24363dcac05ac3a4fe9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/4a874a39b2b00d7e0146cd46fab6f47c41ce9e65", - "reference": "4a874a39b2b00d7e0146cd46fab6f47c41ce9e65", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/ef81c39b67200dcd7401c24363dcac05ac3a4fe9", + "reference": "ef81c39b67200dcd7401c24363dcac05ac3a4fe9", "shasum": "" }, "require": { - "php": ">=5.3.0", + "php": ">=5.3.9", "symfony/translation": "~2.6 || ~3.0 || ~4.0" }, "require-dev": { @@ -877,14 +879,9 @@ "phpunit/phpunit": "^4.8.35 || ^5.7" }, "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.23-dev" - } - }, "autoload": { "psr-4": { - "Carbon\\": "src/Carbon/" + "": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -905,20 +902,20 @@ "datetime", "time" ], - "time": "2018-02-28T09:22:05+00:00" + "time": "2018-04-23T09:02:57+00:00" }, { "name": "paragonie/random_compat", - "version": "v1.4.2", + "version": "v1.4.3", "source": { "type": "git", "url": "https://github.com/paragonie/random_compat.git", - "reference": "965cdeb01fdcab7653253aa81d40441d261f1e66" + "reference": "9b3899e3c3ddde89016f576edb8c489708ad64cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/965cdeb01fdcab7653253aa81d40441d261f1e66", - "reference": "965cdeb01fdcab7653253aa81d40441d261f1e66", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/9b3899e3c3ddde89016f576edb8c489708ad64cd", + "reference": "9b3899e3c3ddde89016f576edb8c489708ad64cd", "shasum": "" }, "require": { @@ -953,7 +950,7 @@ "pseudorandom", "random" ], - "time": "2017-03-13T16:22:52+00:00" + "time": "2018-04-04T21:48:54+00:00" }, { "name": "phroute/phroute", @@ -1048,16 +1045,16 @@ }, { "name": "symfony/console", - "version": "v3.4.5", + "version": "v3.4.9", "source": { "type": "git", "url": "https://github.com/symfony/console.git", - "reference": "067339e9b8ec30d5f19f5950208893ff026b94f7" + "reference": "5b1fdfa8eb93464bcc36c34da39cedffef822cdf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/console/zipball/067339e9b8ec30d5f19f5950208893ff026b94f7", - "reference": "067339e9b8ec30d5f19f5950208893ff026b94f7", + "url": "https://api.github.com/repos/symfony/console/zipball/5b1fdfa8eb93464bcc36c34da39cedffef822cdf", + "reference": "5b1fdfa8eb93464bcc36c34da39cedffef822cdf", "shasum": "" }, "require": { @@ -1078,7 +1075,7 @@ "symfony/process": "~3.3|~4.0" }, "suggest": { - "psr/log": "For using the console logger", + "psr/log-implementation": "For using the console logger", "symfony/event-dispatcher": "", "symfony/lock": "", "symfony/process": "" @@ -1113,20 +1110,20 @@ ], "description": "Symfony Console Component", "homepage": "https://symfony.com", - "time": "2018-02-26T15:46:28+00:00" + "time": "2018-04-30T01:22:56+00:00" }, { "name": "symfony/debug", - "version": "v4.0.5", + "version": "v4.0.9", "source": { "type": "git", "url": "https://github.com/symfony/debug.git", - "reference": "1721e4e7effb23480966690cdcdc7d2a4152d489" + "reference": "e1d57cdb357e5b10f5fdacbb0b86689c0a435e6e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/debug/zipball/1721e4e7effb23480966690cdcdc7d2a4152d489", - "reference": "1721e4e7effb23480966690cdcdc7d2a4152d489", + "url": "https://api.github.com/repos/symfony/debug/zipball/e1d57cdb357e5b10f5fdacbb0b86689c0a435e6e", + "reference": "e1d57cdb357e5b10f5fdacbb0b86689c0a435e6e", "shasum": "" }, "require": { @@ -1169,7 +1166,7 @@ ], "description": "Symfony Debug Component", "homepage": "https://symfony.com", - "time": "2018-02-28T21:50:02+00:00" + "time": "2018-04-30T16:59:37+00:00" }, { "name": "symfony/finder", @@ -1222,16 +1219,16 @@ }, { "name": "symfony/polyfill-mbstring", - "version": "v1.7.0", + "version": "v1.8.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" + "reference": "3296adf6a6454a050679cde90f95350ad604b171" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b", - "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/3296adf6a6454a050679cde90f95350ad604b171", + "reference": "3296adf6a6454a050679cde90f95350ad604b171", "shasum": "" }, "require": { @@ -1243,7 +1240,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.7-dev" + "dev-master": "1.8-dev" } }, "autoload": { @@ -1277,20 +1274,20 @@ "portable", "shim" ], - "time": "2018-01-30T19:27:44+00:00" + "time": "2018-04-26T10:06:28+00:00" }, { "name": "symfony/translation", - "version": "v4.0.5", + "version": "v4.0.9", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938" + "reference": "ad3abf08eb3450491d8d76513100ef58194cd13e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/e20a9b7f9f62cb33a11638b345c248e7d510c938", - "reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938", + "url": "https://api.github.com/repos/symfony/translation/zipball/ad3abf08eb3450491d8d76513100ef58194cd13e", + "reference": "ad3abf08eb3450491d8d76513100ef58194cd13e", "shasum": "" }, "require": { @@ -1311,7 +1308,7 @@ "symfony/yaml": "~3.4|~4.0" }, "suggest": { - "psr/log": "To use logging capability in translator", + "psr/log-implementation": "To use logging capability in translator", "symfony/config": "", "symfony/yaml": "" }, @@ -1345,7 +1342,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-02-22T10:50:29+00:00" + "time": "2018-04-30T01:23:47+00:00" }, { "name": "twig/extensions", @@ -1405,16 +1402,16 @@ }, { "name": "twig/twig", - "version": "v2.4.5", + "version": "v2.4.8", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "43b23931c606aa6d6a91ca47d9f7570633351a6c" + "reference": "7b604c89da162034bdf4bb66310f358d313dd16d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/43b23931c606aa6d6a91ca47d9f7570633351a6c", - "reference": "43b23931c606aa6d6a91ca47d9f7570633351a6c", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/7b604c89da162034bdf4bb66310f358d313dd16d", + "reference": "7b604c89da162034bdf4bb66310f358d313dd16d", "shasum": "" }, "require": { @@ -1423,8 +1420,8 @@ }, "require-dev": { "psr/container": "^1.0", - "symfony/debug": "~2.7", - "symfony/phpunit-bridge": "~3.3@dev" + "symfony/debug": "^2.7", + "symfony/phpunit-bridge": "^3.3" }, "type": "library", "extra": { @@ -1467,7 +1464,7 @@ "keywords": [ "templating" ], - "time": "2018-03-03T01:41:58+00:00" + "time": "2018-04-02T09:24:19+00:00" } ], "packages-dev": [], From 8923ecbdcd1405b3c66e273d82cb238c5ce8a500 Mon Sep 17 00:00:00 2001 From: Repflez Date: Tue, 15 May 2018 15:37:34 -0600 Subject: [PATCH 02/18] Updating illuminate modules to 5.5 --- composer.json | 4 +- composer.lock | 279 +++++++++++++++++++++++++++++--------------------- 2 files changed, 167 insertions(+), 116 deletions(-) diff --git a/composer.json b/composer.json index c3d02cc..448c7ec 100644 --- a/composer.json +++ b/composer.json @@ -4,8 +4,8 @@ "ext-curl": "*", "ext-json": "*", "hashids/hashids": "^2.0", - "illuminate/database": "5.2.*", - "illuminate/filesystem": "5.2.*", + "illuminate/database": "^5.5", + "illuminate/filesystem": "^5.5", "nesbot/carbon": "^1.21", "php": ">=7.2.0", "phroute/phroute": "^2.1", diff --git a/composer.lock b/composer.lock index 838042c..fd98aab 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": "8d430c254f47b62f7d2e72072cc92635", + "content-hash": "8d68eddcd6a9480e4588883a6993459e", "packages": [ { "name": "cloudinary/cloudinary_php", @@ -604,26 +604,27 @@ }, { "name": "illuminate/container", - "version": "v5.2.45", + "version": "v5.6.22", "source": { "type": "git", "url": "https://github.com/illuminate/container.git", - "reference": "5139cebc8293b6820b91aef6f4b4e18bde33c9b2" + "reference": "1a29b314dd5c7a5a5bce3dd7b9da924cc1ec22ec" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/container/zipball/5139cebc8293b6820b91aef6f4b4e18bde33c9b2", - "reference": "5139cebc8293b6820b91aef6f4b4e18bde33c9b2", + "url": "https://api.github.com/repos/illuminate/container/zipball/1a29b314dd5c7a5a5bce3dd7b9da924cc1ec22ec", + "reference": "1a29b314dd5c7a5a5bce3dd7b9da924cc1ec22ec", "shasum": "" }, "require": { - "illuminate/contracts": "5.2.*", - "php": ">=5.5.9" + "illuminate/contracts": "5.6.*", + "php": "^7.1.3", + "psr/container": "~1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.2-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -642,30 +643,32 @@ } ], "description": "The Illuminate Container package.", - "homepage": "http://laravel.com", - "time": "2016-08-01T13:49:14+00:00" + "homepage": "https://laravel.com", + "time": "2018-05-14T12:49:42+00:00" }, { "name": "illuminate/contracts", - "version": "v5.2.45", + "version": "v5.6.22", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "22bde7b048a33c702d9737fc1446234fff9b1363" + "reference": "3dc639feabe0f302f574157a782ede323881a944" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/22bde7b048a33c702d9737fc1446234fff9b1363", - "reference": "22bde7b048a33c702d9737fc1446234fff9b1363", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/3dc639feabe0f302f574157a782ede323881a944", + "reference": "3dc639feabe0f302f574157a782ede323881a944", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^7.1.3", + "psr/container": "~1.0", + "psr/simple-cache": "~1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.2-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -684,42 +687,41 @@ } ], "description": "The Illuminate Contracts package.", - "homepage": "http://laravel.com", - "time": "2016-08-08T11:46:08+00:00" + "homepage": "https://laravel.com", + "time": "2018-05-11T23:38:58+00:00" }, { "name": "illuminate/database", - "version": "v5.2.45", + "version": "v5.6.22", "source": { "type": "git", "url": "https://github.com/illuminate/database.git", - "reference": "4a70c0598ed41d18a99f23c12be4e22b5006d30a" + "reference": "713d376a2e2b9c7cded8916125c24b7b3adb4984" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/database/zipball/4a70c0598ed41d18a99f23c12be4e22b5006d30a", - "reference": "4a70c0598ed41d18a99f23c12be4e22b5006d30a", + "url": "https://api.github.com/repos/illuminate/database/zipball/713d376a2e2b9c7cded8916125c24b7b3adb4984", + "reference": "713d376a2e2b9c7cded8916125c24b7b3adb4984", "shasum": "" }, "require": { - "illuminate/container": "5.2.*", - "illuminate/contracts": "5.2.*", - "illuminate/support": "5.2.*", - "nesbot/carbon": "~1.20", - "php": ">=5.5.9" + "illuminate/container": "5.6.*", + "illuminate/contracts": "5.6.*", + "illuminate/support": "5.6.*", + "php": "^7.1.3" }, "suggest": { - "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.4).", + "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.6).", "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).", - "illuminate/console": "Required to use the database commands (5.2.*).", - "illuminate/events": "Required to use the observers with Eloquent (5.2.*).", - "illuminate/filesystem": "Required to use the migrations (5.2.*).", - "illuminate/pagination": "Required to paginate the result set (5.2.*)." + "illuminate/console": "Required to use the database commands (5.6.*).", + "illuminate/events": "Required to use the observers with Eloquent (5.6.*).", + "illuminate/filesystem": "Required to use the migrations (5.6.*).", + "illuminate/pagination": "Required to paginate the result set (5.6.*)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.2-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -738,44 +740,46 @@ } ], "description": "The Illuminate Database package.", - "homepage": "http://laravel.com", + "homepage": "https://laravel.com", "keywords": [ "database", "laravel", "orm", "sql" ], - "time": "2016-08-25T07:01:20+00:00" + "time": "2018-05-14T22:33:47+00:00" }, { "name": "illuminate/filesystem", - "version": "v5.2.45", + "version": "v5.6.22", "source": { "type": "git", "url": "https://github.com/illuminate/filesystem.git", - "reference": "39668a50e0cf1d673e58e7dbb437475708cfb508" + "reference": "a4ca4a9c2f969ec227748ab334693144995ba0ce" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/filesystem/zipball/39668a50e0cf1d673e58e7dbb437475708cfb508", - "reference": "39668a50e0cf1d673e58e7dbb437475708cfb508", + "url": "https://api.github.com/repos/illuminate/filesystem/zipball/a4ca4a9c2f969ec227748ab334693144995ba0ce", + "reference": "a4ca4a9c2f969ec227748ab334693144995ba0ce", "shasum": "" }, "require": { - "illuminate/contracts": "5.2.*", - "illuminate/support": "5.2.*", - "php": ">=5.5.9", - "symfony/finder": "2.8.*|3.0.*" + "illuminate/contracts": "5.6.*", + "illuminate/support": "5.6.*", + "php": "^7.1.3", + "symfony/finder": "~4.0" }, "suggest": { "league/flysystem": "Required to use the Flysystem local and FTP drivers (~1.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).", - "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0)." + "league/flysystem-cached-adapter": "Required to use the Flysystem cache (~1.0).", + "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).", + "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (~1.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.2-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -794,44 +798,42 @@ } ], "description": "The Illuminate Filesystem package.", - "homepage": "http://laravel.com", - "time": "2016-08-17T17:21:29+00:00" + "homepage": "https://laravel.com", + "time": "2018-05-02T16:10:37+00:00" }, { "name": "illuminate/support", - "version": "v5.2.45", + "version": "v5.6.22", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "510230ab62a7d85dc70203f4fdca6fb71a19e08a" + "reference": "2ef559ad8840481d5247bd7ebfd04eb37d3f6889" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/510230ab62a7d85dc70203f4fdca6fb71a19e08a", - "reference": "510230ab62a7d85dc70203f4fdca6fb71a19e08a", + "url": "https://api.github.com/repos/illuminate/support/zipball/2ef559ad8840481d5247bd7ebfd04eb37d3f6889", + "reference": "2ef559ad8840481d5247bd7ebfd04eb37d3f6889", "shasum": "" }, "require": { - "doctrine/inflector": "~1.0", + "doctrine/inflector": "~1.1", "ext-mbstring": "*", - "illuminate/contracts": "5.2.*", - "paragonie/random_compat": "~1.4", - "php": ">=5.5.9" + "illuminate/contracts": "5.6.*", + "nesbot/carbon": "^1.24.1", + "php": "^7.1.3" }, - "replace": { - "tightenco/collect": "self.version" + "conflict": { + "tightenco/collect": "<5.5.33" }, "suggest": { - "illuminate/filesystem": "Required to use the composer class (5.2.*).", - "jeremeamia/superclosure": "Required to be able to serialize closures (~2.2).", - "symfony/polyfill-php56": "Required to use the hash_equals function on PHP 5.5 (~1.0).", - "symfony/process": "Required to use the composer class (2.8.*|3.0.*).", - "symfony/var-dumper": "Improves the dd function (2.8.*|3.0.*)." + "illuminate/filesystem": "Required to use the composer class (5.6.*).", + "symfony/process": "Required to use the composer class (~4.0).", + "symfony/var-dumper": "Required to use the dd function (~4.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.2-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -853,8 +855,8 @@ } ], "description": "The Illuminate Support package.", - "homepage": "http://laravel.com", - "time": "2016-08-05T14:49:58+00:00" + "homepage": "https://laravel.com", + "time": "2018-05-12T17:43:47+00:00" }, { "name": "nesbot/carbon", @@ -905,96 +907,97 @@ "time": "2018-04-23T09:02:57+00:00" }, { - "name": "paragonie/random_compat", - "version": "v1.4.3", + "name": "phroute/phroute", + "version": "v2.1.0", "source": { "type": "git", - "url": "https://github.com/paragonie/random_compat.git", - "reference": "9b3899e3c3ddde89016f576edb8c489708ad64cd" + "url": "https://github.com/mrjgreen/phroute.git", + "reference": "dbe2b986f9ee1dd33dc956fcc35d1fa22e8e196c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/paragonie/random_compat/zipball/9b3899e3c3ddde89016f576edb8c489708ad64cd", - "reference": "9b3899e3c3ddde89016f576edb8c489708ad64cd", + "url": "https://api.github.com/repos/mrjgreen/phroute/zipball/dbe2b986f9ee1dd33dc956fcc35d1fa22e8e196c", + "reference": "dbe2b986f9ee1dd33dc956fcc35d1fa22e8e196c", "shasum": "" }, "require": { - "php": ">=5.2.0" + "php": ">=5.4.0" }, "require-dev": { - "phpunit/phpunit": "4.*|5.*" - }, - "suggest": { - "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." + "phpunit/phpunit": "*", + "satooshi/php-coveralls": "dev-master" }, "type": "library", "autoload": { - "files": [ - "lib/random.php" - ] + "psr-4": { + "Phroute\\Phroute\\": "src/Phroute" + } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Paragon Initiative Enterprises", - "email": "security@paragonie.com", - "homepage": "https://paragonie.com" + "name": "Joe Green", + "email": "joe.green.0991@gmail.com" } ], - "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", + "description": "Fast, fully featured restful request router for PHP", "keywords": [ - "csprng", - "pseudorandom", - "random" + "router", + "routing" ], - "time": "2018-04-04T21:48:54+00:00" + "time": "2015-07-22T20:46:43+00:00" }, { - "name": "phroute/phroute", - "version": "v2.1.0", + "name": "psr/container", + "version": "1.0.0", "source": { "type": "git", - "url": "https://github.com/mrjgreen/phroute.git", - "reference": "dbe2b986f9ee1dd33dc956fcc35d1fa22e8e196c" + "url": "https://github.com/php-fig/container.git", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mrjgreen/phroute/zipball/dbe2b986f9ee1dd33dc956fcc35d1fa22e8e196c", - "reference": "dbe2b986f9ee1dd33dc956fcc35d1fa22e8e196c", + "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", "shasum": "" }, "require": { - "php": ">=5.4.0" - }, - "require-dev": { - "phpunit/phpunit": "*", - "satooshi/php-coveralls": "dev-master" + "php": ">=5.3.0" }, "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, "autoload": { "psr-4": { - "Phroute\\Phroute\\": "src/Phroute" + "Psr\\Container\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Joe Green", - "email": "joe.green.0991@gmail.com" + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" } ], - "description": "Fast, fully featured restful request router for PHP", + "description": "Common Container Interface (PHP FIG PSR-11)", + "homepage": "https://github.com/php-fig/container", "keywords": [ - "router", - "routing" + "PSR-11", + "container", + "container-interface", + "container-interop", + "psr" ], - "time": "2015-07-22T20:46:43+00:00" + "time": "2017-02-14T16:28:37+00:00" }, { "name": "psr/log", @@ -1043,6 +1046,54 @@ ], "time": "2016-10-10T12:19:37+00:00" }, + { + "name": "psr/simple-cache", + "version": "1.0.1", + "source": { + "type": "git", + "url": "https://github.com/php-fig/simple-cache.git", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\SimpleCache\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interfaces for simple caching", + "keywords": [ + "cache", + "caching", + "psr", + "psr-16", + "simple-cache" + ], + "time": "2017-10-23T01:57:42+00:00" + }, { "name": "symfony/console", "version": "v3.4.9", @@ -1170,25 +1221,25 @@ }, { "name": "symfony/finder", - "version": "v3.0.9", + "version": "v4.0.9", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9" + "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9", - "reference": "3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9", + "url": "https://api.github.com/repos/symfony/finder/zipball/ca27c02b7a3fef4828c998c2ff9ba7aae1641c49", + "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49", "shasum": "" }, "require": { - "php": ">=5.5.9" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.0-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1215,7 +1266,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2016-06-29T05:40:00+00:00" + "time": "2018-04-04T05:10:37+00:00" }, { "name": "symfony/polyfill-mbstring", From cdd6c80777e2957f946f5aa8303c83519cb6e44f Mon Sep 17 00:00:00 2001 From: Repflez Date: Tue, 15 May 2018 15:38:32 -0600 Subject: [PATCH 03/18] Add illuminate/translation --- composer.json | 3 ++- composer.lock | 47 ++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 48 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 448c7ec..fd51e52 100644 --- a/composer.json +++ b/composer.json @@ -12,7 +12,8 @@ "symfony/console": "^3.3", "twig/extensions": "~1.0", "twig/twig": "~2.0", - "cloudinary/cloudinary_php": "^1.8" + "cloudinary/cloudinary_php": "^1.8", + "illuminate/translation": "^5.5" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index fd98aab..8675cf4 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": "8d68eddcd6a9480e4588883a6993459e", + "content-hash": "c4f09b1d56e7329f736e8f09ad8679bc", "packages": [ { "name": "cloudinary/cloudinary_php", @@ -858,6 +858,51 @@ "homepage": "https://laravel.com", "time": "2018-05-12T17:43:47+00:00" }, + { + "name": "illuminate/translation", + "version": "v5.6.22", + "source": { + "type": "git", + "url": "https://github.com/illuminate/translation.git", + "reference": "3612f41b450b8d14e7f5785c087af451ccd3be9c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/illuminate/translation/zipball/3612f41b450b8d14e7f5785c087af451ccd3be9c", + "reference": "3612f41b450b8d14e7f5785c087af451ccd3be9c", + "shasum": "" + }, + "require": { + "illuminate/contracts": "5.6.*", + "illuminate/filesystem": "5.6.*", + "illuminate/support": "5.6.*", + "php": "^7.1.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.6-dev" + } + }, + "autoload": { + "psr-4": { + "Illuminate\\Translation\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Taylor Otwell", + "email": "taylor@laravel.com" + } + ], + "description": "The Illuminate Translation package.", + "homepage": "https://laravel.com", + "time": "2018-02-22T15:33:29+00:00" + }, { "name": "nesbot/carbon", "version": "1.27.0", From 71d0b9ac6e2116be70af4ede0d5c2ee3b7647e4e Mon Sep 17 00:00:00 2001 From: Repflez Date: Tue, 15 May 2018 16:05:50 -0600 Subject: [PATCH 04/18] Revert modules to 5.2 --- composer.json | 6 +- composer.lock | 331 +++++++++++++++++++++----------------------------- 2 files changed, 141 insertions(+), 196 deletions(-) diff --git a/composer.json b/composer.json index fd51e52..56c074e 100644 --- a/composer.json +++ b/composer.json @@ -4,8 +4,8 @@ "ext-curl": "*", "ext-json": "*", "hashids/hashids": "^2.0", - "illuminate/database": "^5.5", - "illuminate/filesystem": "^5.5", + "illuminate/database": "5.2.*", + "illuminate/filesystem": "5.2.*", "nesbot/carbon": "^1.21", "php": ">=7.2.0", "phroute/phroute": "^2.1", @@ -13,7 +13,7 @@ "twig/extensions": "~1.0", "twig/twig": "~2.0", "cloudinary/cloudinary_php": "^1.8", - "illuminate/translation": "^5.5" + "illuminate/translation": "5.2.*" }, "autoload": { "classmap": [ diff --git a/composer.lock b/composer.lock index 8675cf4..041b611 100644 --- a/composer.lock +++ b/composer.lock @@ -1,10 +1,10 @@ { "_readme": [ "This file locks the dependencies of your project to a known state", - "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "c4f09b1d56e7329f736e8f09ad8679bc", + "content-hash": "328b356470d639205462c2e486884a33", "packages": [ { "name": "cloudinary/cloudinary_php", @@ -604,27 +604,26 @@ }, { "name": "illuminate/container", - "version": "v5.6.22", + "version": "v5.2.45", "source": { "type": "git", "url": "https://github.com/illuminate/container.git", - "reference": "1a29b314dd5c7a5a5bce3dd7b9da924cc1ec22ec" + "reference": "5139cebc8293b6820b91aef6f4b4e18bde33c9b2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/container/zipball/1a29b314dd5c7a5a5bce3dd7b9da924cc1ec22ec", - "reference": "1a29b314dd5c7a5a5bce3dd7b9da924cc1ec22ec", + "url": "https://api.github.com/repos/illuminate/container/zipball/5139cebc8293b6820b91aef6f4b4e18bde33c9b2", + "reference": "5139cebc8293b6820b91aef6f4b4e18bde33c9b2", "shasum": "" }, "require": { - "illuminate/contracts": "5.6.*", - "php": "^7.1.3", - "psr/container": "~1.0" + "illuminate/contracts": "5.2.*", + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.6-dev" + "dev-master": "5.2-dev" } }, "autoload": { @@ -643,32 +642,30 @@ } ], "description": "The Illuminate Container package.", - "homepage": "https://laravel.com", - "time": "2018-05-14T12:49:42+00:00" + "homepage": "http://laravel.com", + "time": "2016-08-01T13:49:14+00:00" }, { "name": "illuminate/contracts", - "version": "v5.6.22", + "version": "v5.2.45", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "3dc639feabe0f302f574157a782ede323881a944" + "reference": "22bde7b048a33c702d9737fc1446234fff9b1363" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/3dc639feabe0f302f574157a782ede323881a944", - "reference": "3dc639feabe0f302f574157a782ede323881a944", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/22bde7b048a33c702d9737fc1446234fff9b1363", + "reference": "22bde7b048a33c702d9737fc1446234fff9b1363", "shasum": "" }, "require": { - "php": "^7.1.3", - "psr/container": "~1.0", - "psr/simple-cache": "~1.0" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.6-dev" + "dev-master": "5.2-dev" } }, "autoload": { @@ -687,41 +684,42 @@ } ], "description": "The Illuminate Contracts package.", - "homepage": "https://laravel.com", - "time": "2018-05-11T23:38:58+00:00" + "homepage": "http://laravel.com", + "time": "2016-08-08T11:46:08+00:00" }, { "name": "illuminate/database", - "version": "v5.6.22", + "version": "v5.2.45", "source": { "type": "git", "url": "https://github.com/illuminate/database.git", - "reference": "713d376a2e2b9c7cded8916125c24b7b3adb4984" + "reference": "4a70c0598ed41d18a99f23c12be4e22b5006d30a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/database/zipball/713d376a2e2b9c7cded8916125c24b7b3adb4984", - "reference": "713d376a2e2b9c7cded8916125c24b7b3adb4984", + "url": "https://api.github.com/repos/illuminate/database/zipball/4a70c0598ed41d18a99f23c12be4e22b5006d30a", + "reference": "4a70c0598ed41d18a99f23c12be4e22b5006d30a", "shasum": "" }, "require": { - "illuminate/container": "5.6.*", - "illuminate/contracts": "5.6.*", - "illuminate/support": "5.6.*", - "php": "^7.1.3" + "illuminate/container": "5.2.*", + "illuminate/contracts": "5.2.*", + "illuminate/support": "5.2.*", + "nesbot/carbon": "~1.20", + "php": ">=5.5.9" }, "suggest": { - "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.6).", + "doctrine/dbal": "Required to rename columns and drop SQLite columns (~2.4).", "fzaninotto/faker": "Required to use the eloquent factory builder (~1.4).", - "illuminate/console": "Required to use the database commands (5.6.*).", - "illuminate/events": "Required to use the observers with Eloquent (5.6.*).", - "illuminate/filesystem": "Required to use the migrations (5.6.*).", - "illuminate/pagination": "Required to paginate the result set (5.6.*)." + "illuminate/console": "Required to use the database commands (5.2.*).", + "illuminate/events": "Required to use the observers with Eloquent (5.2.*).", + "illuminate/filesystem": "Required to use the migrations (5.2.*).", + "illuminate/pagination": "Required to paginate the result set (5.2.*)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.6-dev" + "dev-master": "5.2-dev" } }, "autoload": { @@ -740,46 +738,44 @@ } ], "description": "The Illuminate Database package.", - "homepage": "https://laravel.com", + "homepage": "http://laravel.com", "keywords": [ "database", "laravel", "orm", "sql" ], - "time": "2018-05-14T22:33:47+00:00" + "time": "2016-08-25T07:01:20+00:00" }, { "name": "illuminate/filesystem", - "version": "v5.6.22", + "version": "v5.2.45", "source": { "type": "git", "url": "https://github.com/illuminate/filesystem.git", - "reference": "a4ca4a9c2f969ec227748ab334693144995ba0ce" + "reference": "39668a50e0cf1d673e58e7dbb437475708cfb508" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/filesystem/zipball/a4ca4a9c2f969ec227748ab334693144995ba0ce", - "reference": "a4ca4a9c2f969ec227748ab334693144995ba0ce", + "url": "https://api.github.com/repos/illuminate/filesystem/zipball/39668a50e0cf1d673e58e7dbb437475708cfb508", + "reference": "39668a50e0cf1d673e58e7dbb437475708cfb508", "shasum": "" }, "require": { - "illuminate/contracts": "5.6.*", - "illuminate/support": "5.6.*", - "php": "^7.1.3", - "symfony/finder": "~4.0" + "illuminate/contracts": "5.2.*", + "illuminate/support": "5.2.*", + "php": ">=5.5.9", + "symfony/finder": "2.8.*|3.0.*" }, "suggest": { "league/flysystem": "Required to use the Flysystem local and FTP drivers (~1.0).", "league/flysystem-aws-s3-v3": "Required to use the Flysystem S3 driver (~1.0).", - "league/flysystem-cached-adapter": "Required to use the Flysystem cache (~1.0).", - "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0).", - "league/flysystem-sftp": "Required to use the Flysystem SFTP driver (~1.0)." + "league/flysystem-rackspace": "Required to use the Flysystem Rackspace driver (~1.0)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.6-dev" + "dev-master": "5.2-dev" } }, "autoload": { @@ -798,42 +794,44 @@ } ], "description": "The Illuminate Filesystem package.", - "homepage": "https://laravel.com", - "time": "2018-05-02T16:10:37+00:00" + "homepage": "http://laravel.com", + "time": "2016-08-17T17:21:29+00:00" }, { "name": "illuminate/support", - "version": "v5.6.22", + "version": "v5.2.45", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "2ef559ad8840481d5247bd7ebfd04eb37d3f6889" + "reference": "510230ab62a7d85dc70203f4fdca6fb71a19e08a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/2ef559ad8840481d5247bd7ebfd04eb37d3f6889", - "reference": "2ef559ad8840481d5247bd7ebfd04eb37d3f6889", + "url": "https://api.github.com/repos/illuminate/support/zipball/510230ab62a7d85dc70203f4fdca6fb71a19e08a", + "reference": "510230ab62a7d85dc70203f4fdca6fb71a19e08a", "shasum": "" }, "require": { - "doctrine/inflector": "~1.1", + "doctrine/inflector": "~1.0", "ext-mbstring": "*", - "illuminate/contracts": "5.6.*", - "nesbot/carbon": "^1.24.1", - "php": "^7.1.3" + "illuminate/contracts": "5.2.*", + "paragonie/random_compat": "~1.4", + "php": ">=5.5.9" }, - "conflict": { - "tightenco/collect": "<5.5.33" + "replace": { + "tightenco/collect": "self.version" }, "suggest": { - "illuminate/filesystem": "Required to use the composer class (5.6.*).", - "symfony/process": "Required to use the composer class (~4.0).", - "symfony/var-dumper": "Required to use the dd function (~4.0)." + "illuminate/filesystem": "Required to use the composer class (5.2.*).", + "jeremeamia/superclosure": "Required to be able to serialize closures (~2.2).", + "symfony/polyfill-php56": "Required to use the hash_equals function on PHP 5.5 (~1.0).", + "symfony/process": "Required to use the composer class (2.8.*|3.0.*).", + "symfony/var-dumper": "Improves the dd function (2.8.*|3.0.*)." }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.6-dev" + "dev-master": "5.2-dev" } }, "autoload": { @@ -855,33 +853,33 @@ } ], "description": "The Illuminate Support package.", - "homepage": "https://laravel.com", - "time": "2018-05-12T17:43:47+00:00" + "homepage": "http://laravel.com", + "time": "2016-08-05T14:49:58+00:00" }, { "name": "illuminate/translation", - "version": "v5.6.22", + "version": "v5.2.45", "source": { "type": "git", "url": "https://github.com/illuminate/translation.git", - "reference": "3612f41b450b8d14e7f5785c087af451ccd3be9c" + "reference": "19247e4194e110d2d37713709e0e4b8bd0cae620" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/translation/zipball/3612f41b450b8d14e7f5785c087af451ccd3be9c", - "reference": "3612f41b450b8d14e7f5785c087af451ccd3be9c", + "url": "https://api.github.com/repos/illuminate/translation/zipball/19247e4194e110d2d37713709e0e4b8bd0cae620", + "reference": "19247e4194e110d2d37713709e0e4b8bd0cae620", "shasum": "" }, "require": { - "illuminate/contracts": "5.6.*", - "illuminate/filesystem": "5.6.*", - "illuminate/support": "5.6.*", - "php": "^7.1.3" + "illuminate/filesystem": "5.2.*", + "illuminate/support": "5.2.*", + "php": ">=5.5.9", + "symfony/translation": "2.8.*|3.0.*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.6-dev" + "dev-master": "5.2-dev" } }, "autoload": { @@ -900,8 +898,8 @@ } ], "description": "The Illuminate Translation package.", - "homepage": "https://laravel.com", - "time": "2018-02-22T15:33:29+00:00" + "homepage": "http://laravel.com", + "time": "2016-08-01T13:49:14+00:00" }, { "name": "nesbot/carbon", @@ -952,97 +950,96 @@ "time": "2018-04-23T09:02:57+00:00" }, { - "name": "phroute/phroute", - "version": "v2.1.0", + "name": "paragonie/random_compat", + "version": "v1.4.3", "source": { "type": "git", - "url": "https://github.com/mrjgreen/phroute.git", - "reference": "dbe2b986f9ee1dd33dc956fcc35d1fa22e8e196c" + "url": "https://github.com/paragonie/random_compat.git", + "reference": "9b3899e3c3ddde89016f576edb8c489708ad64cd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/mrjgreen/phroute/zipball/dbe2b986f9ee1dd33dc956fcc35d1fa22e8e196c", - "reference": "dbe2b986f9ee1dd33dc956fcc35d1fa22e8e196c", + "url": "https://api.github.com/repos/paragonie/random_compat/zipball/9b3899e3c3ddde89016f576edb8c489708ad64cd", + "reference": "9b3899e3c3ddde89016f576edb8c489708ad64cd", "shasum": "" }, "require": { - "php": ">=5.4.0" + "php": ">=5.2.0" }, "require-dev": { - "phpunit/phpunit": "*", - "satooshi/php-coveralls": "dev-master" + "phpunit/phpunit": "4.*|5.*" + }, + "suggest": { + "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes." }, "type": "library", "autoload": { - "psr-4": { - "Phroute\\Phroute\\": "src/Phroute" - } + "files": [ + "lib/random.php" + ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Joe Green", - "email": "joe.green.0991@gmail.com" + "name": "Paragon Initiative Enterprises", + "email": "security@paragonie.com", + "homepage": "https://paragonie.com" } ], - "description": "Fast, fully featured restful request router for PHP", + "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7", "keywords": [ - "router", - "routing" + "csprng", + "pseudorandom", + "random" ], - "time": "2015-07-22T20:46:43+00:00" + "time": "2018-04-04T21:48:54+00:00" }, { - "name": "psr/container", - "version": "1.0.0", + "name": "phroute/phroute", + "version": "v2.1.0", "source": { "type": "git", - "url": "https://github.com/php-fig/container.git", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f" + "url": "https://github.com/mrjgreen/phroute.git", + "reference": "dbe2b986f9ee1dd33dc956fcc35d1fa22e8e196c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f", - "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f", + "url": "https://api.github.com/repos/mrjgreen/phroute/zipball/dbe2b986f9ee1dd33dc956fcc35d1fa22e8e196c", + "reference": "dbe2b986f9ee1dd33dc956fcc35d1fa22e8e196c", "shasum": "" }, "require": { - "php": ">=5.3.0" + "php": ">=5.4.0" }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } + "require-dev": { + "phpunit/phpunit": "*", + "satooshi/php-coveralls": "dev-master" }, + "type": "library", "autoload": { "psr-4": { - "Psr\\Container\\": "src/" + "Phroute\\Phroute\\": "src/Phroute" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" + "name": "Joe Green", + "email": "joe.green.0991@gmail.com" } ], - "description": "Common Container Interface (PHP FIG PSR-11)", - "homepage": "https://github.com/php-fig/container", + "description": "Fast, fully featured restful request router for PHP", "keywords": [ - "PSR-11", - "container", - "container-interface", - "container-interop", - "psr" + "router", + "routing" ], - "time": "2017-02-14T16:28:37+00:00" + "time": "2015-07-22T20:46:43+00:00" }, { "name": "psr/log", @@ -1091,54 +1088,6 @@ ], "time": "2016-10-10T12:19:37+00:00" }, - { - "name": "psr/simple-cache", - "version": "1.0.1", - "source": { - "type": "git", - "url": "https://github.com/php-fig/simple-cache.git", - "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", - "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", - "shasum": "" - }, - "require": { - "php": ">=5.3.0" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.0.x-dev" - } - }, - "autoload": { - "psr-4": { - "Psr\\SimpleCache\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "PHP-FIG", - "homepage": "http://www.php-fig.org/" - } - ], - "description": "Common interfaces for simple caching", - "keywords": [ - "cache", - "caching", - "psr", - "psr-16", - "simple-cache" - ], - "time": "2017-10-23T01:57:42+00:00" - }, { "name": "symfony/console", "version": "v3.4.9", @@ -1266,25 +1215,25 @@ }, { "name": "symfony/finder", - "version": "v4.0.9", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49" + "reference": "3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/ca27c02b7a3fef4828c998c2ff9ba7aae1641c49", - "reference": "ca27c02b7a3fef4828c998c2ff9ba7aae1641c49", + "url": "https://api.github.com/repos/symfony/finder/zipball/3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9", + "reference": "3eb4e64c6145ef8b92adefb618a74ebdde9e3fe9", "shasum": "" }, "require": { - "php": "^7.1.3" + "php": ">=5.5.9" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -1311,7 +1260,7 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2018-04-04T05:10:37+00:00" + "time": "2016-06-29T05:40:00+00:00" }, { "name": "symfony/polyfill-mbstring", @@ -1374,44 +1323,40 @@ }, { "name": "symfony/translation", - "version": "v4.0.9", + "version": "v3.0.9", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "ad3abf08eb3450491d8d76513100ef58194cd13e" + "reference": "eee6c664853fd0576f21ae25725cfffeafe83f26" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/ad3abf08eb3450491d8d76513100ef58194cd13e", - "reference": "ad3abf08eb3450491d8d76513100ef58194cd13e", + "url": "https://api.github.com/repos/symfony/translation/zipball/eee6c664853fd0576f21ae25725cfffeafe83f26", + "reference": "eee6c664853fd0576f21ae25725cfffeafe83f26", "shasum": "" }, "require": { - "php": "^7.1.3", + "php": ">=5.5.9", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/config": "<3.4", - "symfony/dependency-injection": "<3.4", - "symfony/yaml": "<3.4" + "symfony/config": "<2.8" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~3.4|~4.0", - "symfony/dependency-injection": "~3.4|~4.0", - "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/intl": "~3.4|~4.0", - "symfony/yaml": "~3.4|~4.0" + "symfony/config": "~2.8|~3.0", + "symfony/intl": "~2.8|~3.0", + "symfony/yaml": "~2.8|~3.0" }, "suggest": { - "psr/log-implementation": "To use logging capability in translator", + "psr/log": "To use logging capability in translator", "symfony/config": "", "symfony/yaml": "" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "4.0-dev" + "dev-master": "3.0-dev" } }, "autoload": { @@ -1438,7 +1383,7 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2018-04-30T01:23:47+00:00" + "time": "2016-07-30T07:22:48+00:00" }, { "name": "twig/extensions", From 92ec1442baaf35c697d0c760466e4d50f497e3c3 Mon Sep 17 00:00:00 2001 From: Repflez Date: Tue, 15 May 2018 17:11:42 -0600 Subject: [PATCH 05/18] Add default language for users --- ...2018_05_15_165421_add_default_language.php | 37 +++++++++++++++++++ src/User.php | 8 ++++ 2 files changed, 45 insertions(+) create mode 100644 database/2018_05_15_165421_add_default_language.php diff --git a/database/2018_05_15_165421_add_default_language.php b/database/2018_05_15_165421_add_default_language.php new file mode 100644 index 0000000..a52d24f --- /dev/null +++ b/database/2018_05_15_165421_add_default_language.php @@ -0,0 +1,37 @@ +table('users', function (Blueprint $table) { + $table->string('lang', 2) + ->default('en'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + $schema = DB::getSchemaBuilder(); + + $schema->table('users', function (Blueprint $table) { + $table->dropColumn('lang'); + }); + } +} diff --git a/src/User.php b/src/User.php index 42bccec..920db74 100644 --- a/src/User.php +++ b/src/User.php @@ -203,6 +203,13 @@ class User */ public $news_dot = 0; + /** + * Current Language. + * + * @var string + */ + public $lang = 'en'; + /** * Mii holder for this user. */ @@ -315,6 +322,7 @@ private function __construct($userId) $this->follows = intval($userRow->follow_count); $this->followers = intval($userRow->follow_back_count); $this->news_dot = boolval($userRow->news_dot); + $this->lang = $userRow->lang; $this->registerIp = Net::ntop($userRow->register_ip); $this->lastIp = Net::ntop($userRow->last_ip); From 9816af4d9faa19ee7ae544fb8a2ad398fa88d52c Mon Sep 17 00:00:00 2001 From: Repflez Date: Tue, 15 May 2018 17:12:16 -0600 Subject: [PATCH 06/18] Add translation system --- composer.json | 4 +++ public/index.php | 2 ++ src/Template.php | 1 + src/Translation.php | 59 +++++++++++++++++++++++++++++++++++++++++++++ utility.php | 6 +++++ 5 files changed, 72 insertions(+) create mode 100644 src/Translation.php diff --git a/composer.json b/composer.json index 56c074e..781e66d 100644 --- a/composer.json +++ b/composer.json @@ -25,5 +25,9 @@ "files": [ "utility.php" ] + }, + "config": { + "sort-packages": true, + "optimize-autoloader": true } } diff --git a/public/index.php b/public/index.php index 0d2bfa5..211d7ab 100644 --- a/public/index.php +++ b/public/index.php @@ -24,6 +24,8 @@ ); ConsoleAuth::check(); +Translation::init(); + // Set base variables $templateBases = [ 'ctr', diff --git a/src/Template.php b/src/Template.php index 8ff6be3..0af6679 100644 --- a/src/Template.php +++ b/src/Template.php @@ -61,6 +61,7 @@ class Template 'session_id', 'hashid', 'dehashid', + '__', ]; /** diff --git a/src/Translation.php b/src/Translation.php new file mode 100644 index 0000000..0ec30bf --- /dev/null +++ b/src/Translation.php @@ -0,0 +1,59 @@ +lang); + + // Register the fallback language + self::$engine->setFallback('en'); + } + + /** + * Get a string from the translation + * + * @param string $key + * @param array $replace + * + * @return string|array|null + */ + public static function get(string $key, array $replace = []) + { + return self::$engine->get($key, $replace); + } +} diff --git a/utility.php b/utility.php index 4395a56..6fbdc69 100644 --- a/utility.php +++ b/utility.php @@ -11,6 +11,7 @@ use Miiverse\Net; use Miiverse\Router; use Miiverse\Template; +use Miiverse\Translation; // Sort of alias for Config::get function config($value) @@ -265,3 +266,8 @@ function dehashid($hash) { return Hashid::decode($hash); } + +function __(string $key, array $replace = []) +{ + return Translation::get($key, $replace); +} \ No newline at end of file From 282b1390c2ccde6679dcf3dd8f489af03aad43fd Mon Sep 17 00:00:00 2001 From: Repflez Date: Tue, 15 May 2018 17:14:21 -0600 Subject: [PATCH 07/18] StyleCI fixes. --- src/Translation.php | 5 ++--- utility.php | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Translation.php b/src/Translation.php index 0ec30bf..2672189 100644 --- a/src/Translation.php +++ b/src/Translation.php @@ -8,7 +8,6 @@ use Illuminate\Filesystem\Filesystem; use Illuminate\Translation\FileLoader; use Illuminate\Translation\Translator; -use Miiverse\CurrentSession; /** * Translation system. @@ -45,10 +44,10 @@ public static function init() : void } /** - * Get a string from the translation + * Get a string from the translation. * * @param string $key - * @param array $replace + * @param array $replace * * @return string|array|null */ diff --git a/utility.php b/utility.php index 6fbdc69..5121136 100644 --- a/utility.php +++ b/utility.php @@ -270,4 +270,4 @@ function dehashid($hash) function __(string $key, array $replace = []) { return Translation::get($key, $replace); -} \ No newline at end of file +} From 61ab65b61181e73e8ef908ee59a63d64cf8b55fd Mon Sep 17 00:00:00 2001 From: Repflez Date: Tue, 15 May 2018 17:27:57 -0600 Subject: [PATCH 08/18] Convert community/index for translation --- resources/lang/en/community.php | 48 +++++++++++++++++++++ resources/views/ctr/community/index.twig | 54 ++++++++++++------------ 2 files changed, 75 insertions(+), 27 deletions(-) create mode 100644 resources/lang/en/community.php diff --git a/resources/lang/en/community.php b/resources/lang/en/community.php new file mode 100644 index 0000000..a29ff4c --- /dev/null +++ b/resources/lang/en/community.php @@ -0,0 +1,48 @@ + [ + 'header' => [ + 'desc' => 'Check out the communities for games that you play or games that you\'re curious about!', + 'title' => 'Communities', + ], + 'favorites' => 'Favorite Communities', + 'search' => [ + 'desc' => 'Search Communities', + 'name' => 'Search', + ], + 'communities' => [ + 'filter' => [ + 'name' => 'Filter', + 'select' => 'Please make a selection.', + 'options' => [ + 'all' => 'All Software', + 'games' => ':console Games', + 'vc' => 'Virtual Console', + 'other' => 'Others', + ], + ], + 'new' => 'New Communities', + 'special' => 'Special', + 'platforms' => [ + '3ds' => '3DS Games', + 'wiiu' => 'Wii U Games', + 'wiiu-3ds' => 'Wii U Games・3DS Games', + 'switch' => 'Switch Games', + 'switch-wiiu' => 'Switch Games・Wii U Games', + 'wii' => 'Wii Games', + 'ds' => 'DS Games', + 'wii-ds' => 'Wii Games・DS Games', + 'special' => 'Special Community', + ], + 'empty' => 'There are no communities in this category.', + 'more' => 'Show More', + ], + 'footer' => [ + 'console' => ':console Communities', + ], + ], +]; \ No newline at end of file diff --git a/resources/views/ctr/community/index.twig b/resources/views/ctr/community/index.twig index 48e7bef..4046b12 100644 --- a/resources/views/ctr/community/index.twig +++ b/resources/views/ctr/community/index.twig @@ -5,23 +5,23 @@
-

Check out the communities for games that you play or games that you're curious about!

+

{{ __('community.index.header.desc') }}

- Communities + {{ __('community.index.header.title') }}

- Search - + {{ __('community.index.search.name') }} + - Favorite Communities + {{ __('community.index.favorites') }}
@@ -29,17 +29,17 @@
-

New Communities

+

{{ __('community.index.communities.new') }}

@@ -58,28 +58,28 @@ {{ community.name }} {% if community.platform == 1 %} - 3DS Games + {{ __('community.index.communities.platforms.3ds') }} {% elseif community.platform == 2 %} - Wii U Games + {{ __('community.index.communities.platforms.wiiu') }} {% elseif community.platform == 3 %} - Wii U Games・3DS Games + {{ __('community.index.communities.platforms.wiiu-3ds') }} {% elseif community.platform == 4 %} - Switch Games + {{ __('community.index.communities.platforms.switch') }} {% elseif community.platform == 5 %} - Switch Games・Wii U Games + {{ __('community.index.communities.platforms.switch-wiiu') }} {% elseif community.platform == 6 %} - Wii Games + {{ __('community.index.communities.platforms.wii') }} {% elseif community.platform == 7 %} - DS Games + {{ __('community.index.communities.platforms.ds') }} {% elseif community.platform == 8 %} - Wii Games・DS Games + {{ __('community.index.communities.platforms.wii-ds') }} {% endif %}
@@ -88,14 +88,14 @@ {% else %}
-

There are no communities in this category.

+

{{ __('community.index.communities.empty') }}

{% endif %} {% if communities.newest.more %} - Show More + {{ __('community.index.communities.more') }} {% endif %} -

Special

+

{{ __('community.index.communities.special') }}

{% if communities.special is not empty %}
    {% for community in communities.special.titles %} @@ -124,7 +124,7 @@ {% elseif community.platform == 8 %} {% endif %} - Special Community + {{ __('community.index.communities.platform.special') }}
{% endfor %} @@ -132,18 +132,18 @@ {% else %}
-

There are no communities in this category.

+

{{ __('community.index.communities.empty') }}

{% endif %} {% if communities.special.more %} - Show More + {{ __('community.index.communities.more') }} {% endif %}
- {{ console.name }} Communities + {{ __('community.index.footer.console', { console: console.name }) }} {% include '_footer.twig' %}
From 787d5d7ae286f8542d7adcacb44d7e944aa2a622 Mon Sep 17 00:00:00 2001 From: Repflez Date: Tue, 15 May 2018 17:29:14 -0600 Subject: [PATCH 09/18] Line endings... --- resources/views/ctr/community/index.twig | 290 +++++++++++------------ 1 file changed, 145 insertions(+), 145 deletions(-) diff --git a/resources/views/ctr/community/index.twig b/resources/views/ctr/community/index.twig index 4046b12..f13b296 100644 --- a/resources/views/ctr/community/index.twig +++ b/resources/views/ctr/community/index.twig @@ -2,149 +2,149 @@ {% extends '@ctr/_master.twig' %} {% block content %} -
-
-
-

{{ __('community.index.header.desc') }}

-
-
-

- - - {{ __('community.index.header.title') }} - -

-
-
- - {{ __('community.index.search.name') }} - - - - {{ __('community.index.favorites') }} - -
-
-
-
-
-
-

{{ __('community.index.communities.new') }}

-
-
- -
-
-
- {% if communities.newest is not empty %} -
    - {% for community in communities.newest.titles %} - {% set id,title_id = hashid(community.id), hashid(community.title_id) %} -
  • - - - - -
    - {{ community.name }} - {% if community.platform == 1 %} - - {{ __('community.index.communities.platforms.3ds') }} - {% elseif community.platform == 2 %} - - {{ __('community.index.communities.platforms.wiiu') }} - {% elseif community.platform == 3 %} - - {{ __('community.index.communities.platforms.wiiu-3ds') }} - {% elseif community.platform == 4 %} - - {{ __('community.index.communities.platforms.switch') }} - {% elseif community.platform == 5 %} - - {{ __('community.index.communities.platforms.switch-wiiu') }} - {% elseif community.platform == 6 %} - - {{ __('community.index.communities.platforms.wii') }} - {% elseif community.platform == 7 %} - - {{ __('community.index.communities.platforms.ds') }} - {% elseif community.platform == 8 %} - - {{ __('community.index.communities.platforms.wii-ds') }} - {% endif %} -
    -
    • - {% endfor %} -
- {% else %} -
-
-

{{ __('community.index.communities.empty') }}

-
-
- {% endif %} - {% if communities.newest.more %} - {{ __('community.index.communities.more') }} - {% endif %} -

{{ __('community.index.communities.special') }}

- {% if communities.special is not empty %} -
    - {% for community in communities.special.titles %} - {% set id,title_id = hashid(community.id), hashid(community.title_id) %} -
  • - - - - -
    - {{ community.name }} - {% if community.platform == 1 %} - - {% elseif community.platform == 2 %} - - {% elseif community.platform == 3 %} - - {% elseif community.platform == 4 %} - - {% elseif community.platform == 5 %} - - {% elseif community.platform == 6 %} - - {% elseif community.platform == 7 %} - - {% elseif community.platform == 8 %} - - {% endif %} - {{ __('community.index.communities.platform.special') }} -
    -
    • - {% endfor %} -
- {% else %} -
-
-

{{ __('community.index.communities.empty') }}

-
-
- {% endif %} - {% if communities.special.more %} - {{ __('community.index.communities.more') }} - {% endif %} -
-
-
-
- {{ __('community.index.footer.console', { console: console.name }) }} - {% include '_footer.twig' %} -
-
+
+
+
+

{{ __('community.index.header.desc') }}

+
+
+

+ + + {{ __('community.index.header.title') }} + +

+
+
+ + {{ __('community.index.search.name') }} + + + + {{ __('community.index.favorites') }} + +
+
+
+
+
+
+

{{ __('community.index.communities.new') }}

+
+
+ +
+
+
+ {% if communities.newest is not empty %} +
    + {% for community in communities.newest.titles %} + {% set id,title_id = hashid(community.id), hashid(community.title_id) %} +
  • + + + + +
    + {{ community.name }} + {% if community.platform == 1 %} + + {{ __('community.index.communities.platforms.3ds') }} + {% elseif community.platform == 2 %} + + {{ __('community.index.communities.platforms.wiiu') }} + {% elseif community.platform == 3 %} + + {{ __('community.index.communities.platforms.wiiu-3ds') }} + {% elseif community.platform == 4 %} + + {{ __('community.index.communities.platforms.switch') }} + {% elseif community.platform == 5 %} + + {{ __('community.index.communities.platforms.switch-wiiu') }} + {% elseif community.platform == 6 %} + + {{ __('community.index.communities.platforms.wii') }} + {% elseif community.platform == 7 %} + + {{ __('community.index.communities.platforms.ds') }} + {% elseif community.platform == 8 %} + + {{ __('community.index.communities.platforms.wii-ds') }} + {% endif %} +
    +
    • + {% endfor %} +
+ {% else %} +
+
+

{{ __('community.index.communities.empty') }}

+
+
+ {% endif %} + {% if communities.newest.more %} + {{ __('community.index.communities.more') }} + {% endif %} +

{{ __('community.index.communities.special') }}

+ {% if communities.special is not empty %} +
    + {% for community in communities.special.titles %} + {% set id,title_id = hashid(community.id), hashid(community.title_id) %} +
  • + + + + +
    + {{ community.name }} + {% if community.platform == 1 %} + + {% elseif community.platform == 2 %} + + {% elseif community.platform == 3 %} + + {% elseif community.platform == 4 %} + + {% elseif community.platform == 5 %} + + {% elseif community.platform == 6 %} + + {% elseif community.platform == 7 %} + + {% elseif community.platform == 8 %} + + {% endif %} + {{ __('community.index.communities.platform.special') }} +
    +
    • + {% endfor %} +
+ {% else %} +
+
+

{{ __('community.index.communities.empty') }}

+
+
+ {% endif %} + {% if communities.special.more %} + {{ __('community.index.communities.more') }} + {% endif %} +
+
+
+
+ {{ __('community.index.footer.console', { console: console.name }) }} + {% include '_footer.twig' %} +
+
{% endblock %} From 2da9523da171fbe061a8c940a59fc4f87616f8ce Mon Sep 17 00:00:00 2001 From: Repflez Date: Tue, 15 May 2018 17:31:14 -0600 Subject: [PATCH 10/18] Revert "Line endings..." This reverts commit 787d5d7ae286f8542d7adcacb44d7e944aa2a622. --- resources/views/ctr/community/index.twig | 290 +++++++++++------------ 1 file changed, 145 insertions(+), 145 deletions(-) diff --git a/resources/views/ctr/community/index.twig b/resources/views/ctr/community/index.twig index f13b296..4046b12 100644 --- a/resources/views/ctr/community/index.twig +++ b/resources/views/ctr/community/index.twig @@ -2,149 +2,149 @@ {% extends '@ctr/_master.twig' %} {% block content %} -
-
-
-

{{ __('community.index.header.desc') }}

-
-
-

- - - {{ __('community.index.header.title') }} - -

-
-
- - {{ __('community.index.search.name') }} - - - - {{ __('community.index.favorites') }} - -
-
-
-
-
-
-

{{ __('community.index.communities.new') }}

-
-
- -
-
-
- {% if communities.newest is not empty %} -
    - {% for community in communities.newest.titles %} - {% set id,title_id = hashid(community.id), hashid(community.title_id) %} -
  • - - - - -
    - {{ community.name }} - {% if community.platform == 1 %} - - {{ __('community.index.communities.platforms.3ds') }} - {% elseif community.platform == 2 %} - - {{ __('community.index.communities.platforms.wiiu') }} - {% elseif community.platform == 3 %} - - {{ __('community.index.communities.platforms.wiiu-3ds') }} - {% elseif community.platform == 4 %} - - {{ __('community.index.communities.platforms.switch') }} - {% elseif community.platform == 5 %} - - {{ __('community.index.communities.platforms.switch-wiiu') }} - {% elseif community.platform == 6 %} - - {{ __('community.index.communities.platforms.wii') }} - {% elseif community.platform == 7 %} - - {{ __('community.index.communities.platforms.ds') }} - {% elseif community.platform == 8 %} - - {{ __('community.index.communities.platforms.wii-ds') }} - {% endif %} -
    -
    • - {% endfor %} -
- {% else %} -
-
-

{{ __('community.index.communities.empty') }}

-
-
- {% endif %} - {% if communities.newest.more %} - {{ __('community.index.communities.more') }} - {% endif %} -

{{ __('community.index.communities.special') }}

- {% if communities.special is not empty %} -
    - {% for community in communities.special.titles %} - {% set id,title_id = hashid(community.id), hashid(community.title_id) %} -
  • - - - - -
    - {{ community.name }} - {% if community.platform == 1 %} - - {% elseif community.platform == 2 %} - - {% elseif community.platform == 3 %} - - {% elseif community.platform == 4 %} - - {% elseif community.platform == 5 %} - - {% elseif community.platform == 6 %} - - {% elseif community.platform == 7 %} - - {% elseif community.platform == 8 %} - - {% endif %} - {{ __('community.index.communities.platform.special') }} -
    -
    • - {% endfor %} -
- {% else %} -
-
-

{{ __('community.index.communities.empty') }}

-
-
- {% endif %} - {% if communities.special.more %} - {{ __('community.index.communities.more') }} - {% endif %} -
-
-
-
- {{ __('community.index.footer.console', { console: console.name }) }} - {% include '_footer.twig' %} -
-
+
+
+
+

{{ __('community.index.header.desc') }}

+
+
+

+ + + {{ __('community.index.header.title') }} + +

+
+
+ + {{ __('community.index.search.name') }} + + + + {{ __('community.index.favorites') }} + +
+
+
+
+
+
+

{{ __('community.index.communities.new') }}

+
+
+ +
+
+
+ {% if communities.newest is not empty %} +
    + {% for community in communities.newest.titles %} + {% set id,title_id = hashid(community.id), hashid(community.title_id) %} +
  • + + + + +
    + {{ community.name }} + {% if community.platform == 1 %} + + {{ __('community.index.communities.platforms.3ds') }} + {% elseif community.platform == 2 %} + + {{ __('community.index.communities.platforms.wiiu') }} + {% elseif community.platform == 3 %} + + {{ __('community.index.communities.platforms.wiiu-3ds') }} + {% elseif community.platform == 4 %} + + {{ __('community.index.communities.platforms.switch') }} + {% elseif community.platform == 5 %} + + {{ __('community.index.communities.platforms.switch-wiiu') }} + {% elseif community.platform == 6 %} + + {{ __('community.index.communities.platforms.wii') }} + {% elseif community.platform == 7 %} + + {{ __('community.index.communities.platforms.ds') }} + {% elseif community.platform == 8 %} + + {{ __('community.index.communities.platforms.wii-ds') }} + {% endif %} +
    +
    • + {% endfor %} +
+ {% else %} +
+
+

{{ __('community.index.communities.empty') }}

+
+
+ {% endif %} + {% if communities.newest.more %} + {{ __('community.index.communities.more') }} + {% endif %} +

{{ __('community.index.communities.special') }}

+ {% if communities.special is not empty %} +
    + {% for community in communities.special.titles %} + {% set id,title_id = hashid(community.id), hashid(community.title_id) %} +
  • + + + + +
    + {{ community.name }} + {% if community.platform == 1 %} + + {% elseif community.platform == 2 %} + + {% elseif community.platform == 3 %} + + {% elseif community.platform == 4 %} + + {% elseif community.platform == 5 %} + + {% elseif community.platform == 6 %} + + {% elseif community.platform == 7 %} + + {% elseif community.platform == 8 %} + + {% endif %} + {{ __('community.index.communities.platform.special') }} +
    +
    • + {% endfor %} +
+ {% else %} +
+
+

{{ __('community.index.communities.empty') }}

+
+
+ {% endif %} + {% if communities.special.more %} + {{ __('community.index.communities.more') }} + {% endif %} +
+
+
+
+ {{ __('community.index.footer.console', { console: console.name }) }} + {% include '_footer.twig' %} +
+
{% endblock %} From 0b5e752cce7c80f62a2237551274760be0330e9f Mon Sep 17 00:00:00 2001 From: Repflez Date: Tue, 15 May 2018 17:31:46 -0600 Subject: [PATCH 11/18] Fix tabs on translation files. --- resources/lang/en/community.php | 82 ++++++++++++++++----------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/resources/lang/en/community.php b/resources/lang/en/community.php index a29ff4c..ed8dbf7 100644 --- a/resources/lang/en/community.php +++ b/resources/lang/en/community.php @@ -4,45 +4,45 @@ */ return [ - 'index' => [ - 'header' => [ - 'desc' => 'Check out the communities for games that you play or games that you\'re curious about!', - 'title' => 'Communities', - ], - 'favorites' => 'Favorite Communities', - 'search' => [ - 'desc' => 'Search Communities', - 'name' => 'Search', - ], - 'communities' => [ - 'filter' => [ - 'name' => 'Filter', - 'select' => 'Please make a selection.', - 'options' => [ - 'all' => 'All Software', - 'games' => ':console Games', - 'vc' => 'Virtual Console', - 'other' => 'Others', - ], - ], - 'new' => 'New Communities', - 'special' => 'Special', - 'platforms' => [ - '3ds' => '3DS Games', - 'wiiu' => 'Wii U Games', - 'wiiu-3ds' => 'Wii U Games・3DS Games', - 'switch' => 'Switch Games', - 'switch-wiiu' => 'Switch Games・Wii U Games', - 'wii' => 'Wii Games', - 'ds' => 'DS Games', - 'wii-ds' => 'Wii Games・DS Games', - 'special' => 'Special Community', - ], - 'empty' => 'There are no communities in this category.', - 'more' => 'Show More', - ], - 'footer' => [ - 'console' => ':console Communities', - ], - ], + 'index' => [ + 'header' => [ + 'desc' => 'Check out the communities for games that you play or games that you\'re curious about!', + 'title' => 'Communities', + ], + 'favorites' => 'Favorite Communities', + 'search' => [ + 'desc' => 'Search Communities', + 'name' => 'Search', + ], + 'communities' => [ + 'filter' => [ + 'name' => 'Filter', + 'select' => 'Please make a selection.', + 'options' => [ + 'all' => 'All Software', + 'games' => ':console Games', + 'vc' => 'Virtual Console', + 'other' => 'Others', + ], + ], + 'new' => 'New Communities', + 'special' => 'Special', + 'platforms' => [ + '3ds' => '3DS Games', + 'wiiu' => 'Wii U Games', + 'wiiu-3ds' => 'Wii U Games・3DS Games', + 'switch' => 'Switch Games', + 'switch-wiiu' => 'Switch Games・Wii U Games', + 'wii' => 'Wii Games', + 'ds' => 'DS Games', + 'wii-ds' => 'Wii Games・DS Games', + 'special' => 'Special Community', + ], + 'empty' => 'There are no communities in this category.', + 'more' => 'Show More', + ], + 'footer' => [ + 'console' => ':console Communities', + ], + ], ]; \ No newline at end of file From 297a257df40211a6b802eb2feb154757c51f31cc Mon Sep 17 00:00:00 2001 From: Repflez Date: Tue, 15 May 2018 17:34:43 -0600 Subject: [PATCH 12/18] Update .styleci.yml --- .styleci.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.styleci.yml b/.styleci.yml index 18ead89..f9b8a81 100644 --- a/.styleci.yml +++ b/.styleci.yml @@ -4,4 +4,8 @@ finder: exclude: - store - vendor - name: "*.php" \ No newline at end of file + name: "*.php" + +finder: + not-path: + - resources/lang/en \ No newline at end of file From 7fa634d811aadd076151d6d23b7c3007a6494347 Mon Sep 17 00:00:00 2001 From: Repflez Date: Tue, 15 May 2018 17:43:08 -0600 Subject: [PATCH 13/18] Update .styleci.yml again --- .styleci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.styleci.yml b/.styleci.yml index f9b8a81..ad78820 100644 --- a/.styleci.yml +++ b/.styleci.yml @@ -8,4 +8,4 @@ finder: finder: not-path: - - resources/lang/en \ No newline at end of file + - resources/lang \ No newline at end of file From 1675cafc08ee60de929c51d9a50852f75c43be9a Mon Sep 17 00:00:00 2001 From: Repflez Date: Tue, 15 May 2018 17:47:41 -0600 Subject: [PATCH 14/18] Update .styleci.yml --- .styleci.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.styleci.yml b/.styleci.yml index ad78820..af16329 100644 --- a/.styleci.yml +++ b/.styleci.yml @@ -4,8 +4,6 @@ finder: exclude: - store - vendor - name: "*.php" - -finder: not-path: - - resources/lang \ No newline at end of file + - resources/lang + name: "*.php" \ No newline at end of file From 9a37e9461017b83c08237db9945138dae7b7dac0 Mon Sep 17 00:00:00 2001 From: Repflez Date: Tue, 15 May 2018 17:54:24 -0600 Subject: [PATCH 15/18] Add community/listing translations --- resources/lang/en/community.php | 26 ++++++++++++++ resources/views/ctr/community/listing.twig | 40 +++++++++++----------- 2 files changed, 46 insertions(+), 20 deletions(-) diff --git a/resources/lang/en/community.php b/resources/lang/en/community.php index ed8dbf7..c253ab3 100644 --- a/resources/lang/en/community.php +++ b/resources/lang/en/community.php @@ -45,4 +45,30 @@ 'console' => ':console Communities', ], ], + + 'listing' => [ + 'filter' => [ + 'name' => 'Filter', + 'select' => 'Please make a selection.', + 'options' => [ + 'all' => 'All Software', + 'games' => ':console Games', + 'vc' => 'Virtual Console', + 'other' => 'Others', + ], + ], + 'communities' => [ + 'platforms' => [ + '3ds' => '3DS Games', + 'wiiu' => 'Wii U Games', + 'wiiu-3ds' => 'Wii U Games・3DS Games', + 'switch' => 'Switch Games', + 'switch-wiiu' => 'Switch Games・Wii U Games', + 'wii' => 'Wii Games', + 'ds' => 'DS Games', + 'wii-ds' => 'Wii Games・DS Games', + ], + 'empty' => 'There are no communities in this category.', + ], + ], ]; \ No newline at end of file diff --git a/resources/views/ctr/community/listing.twig b/resources/views/ctr/community/listing.twig index 3102375..275ed06 100644 --- a/resources/views/ctr/community/listing.twig +++ b/resources/views/ctr/community/listing.twig @@ -19,13 +19,13 @@
@@ -44,28 +44,28 @@ {{ community.name }} {% if community.platform == 1 %} - 3DS Games + {{ __('community.listing.communities.platforms.3ds') }} {% elseif community.platform == 2 %} - Wii U Games + {{ __('community.listing.communities.platforms.wiiu') }} {% elseif community.platform == 3 %} - Wii U Games・3DS Games + {{ __('community.listing.communities.platforms.wiiu-3ds') }} {% elseif community.platform == 4 %} - Switch Games + {{ __('community.listing.communities.platforms.switch') }} {% elseif community.platform == 5 %} - Switch Games・Wii U Games + {{ __('community.listing.communities.platforms.switch-wiiu') }} {% elseif community.platform == 6 %} - Wii Games + {{ __('community.listing.communities.platforms.wii') }} {% elseif community.platform == 7 %} - DS Games + {{ __('community.listing.communities.platforms.ds') }} {% elseif community.platform == 8 %} - Wii Games・DS Games + {{ __('community.listing.communities.platforms.wii-ds') }} {% endif %}
@@ -74,19 +74,19 @@ {% else %}
-

There are no communities in this category.

+

{{ __('community.listing.communities.empty') }}

{% endif %} -

Filter

+

{{ __('community.listing.filter.name') }}

- All Software - {{ console.name }} Games + {{ __('community.listing.filter.options.all') }} + {{ __('community.listing.filter.options.games', { console: console.name }) }}
- Virtual Console - Others + {{ __('community.listing.filter.options.vc') }} + {{ __('community.listing.filter.options.other') }}
From b4fecb608ab6e26ee87e24ce478872422472bed5 Mon Sep 17 00:00:00 2001 From: Repflez Date: Tue, 15 May 2018 17:55:20 -0600 Subject: [PATCH 16/18] Fix missing translation --- resources/views/ctr/community/index.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/ctr/community/index.twig b/resources/views/ctr/community/index.twig index 4046b12..5dcadd5 100644 --- a/resources/views/ctr/community/index.twig +++ b/resources/views/ctr/community/index.twig @@ -39,7 +39,7 @@ - + From ef509d0633fe7c90b69d66a81423188938501d0e Mon Sep 17 00:00:00 2001 From: Repflez Date: Tue, 15 May 2018 22:40:37 -0600 Subject: [PATCH 17/18] Add translations for error screens --- resources/lang/en/errors.php | 16 ++++++++++++++++ resources/views/ctr/errors/403.twig | 10 +++++----- resources/views/ctr/errors/404.twig | 6 +++--- 3 files changed, 24 insertions(+), 8 deletions(-) create mode 100644 resources/lang/en/errors.php diff --git a/resources/lang/en/errors.php b/resources/lang/en/errors.php new file mode 100644 index 0000000..5fd5109 --- /dev/null +++ b/resources/lang/en/errors.php @@ -0,0 +1,16 @@ + [ + 'title' => 'Error', + 'desc' => 'The screen could not be displayed.', + ], + + '404' => [ + 'title' => 'Error', + 'desc' => 'The screen could not be displayed.', + ], +]; \ No newline at end of file diff --git a/resources/views/ctr/errors/403.twig b/resources/views/ctr/errors/403.twig index 614ee78..12d5d90 100644 --- a/resources/views/ctr/errors/403.twig +++ b/resources/views/ctr/errors/403.twig @@ -4,16 +4,16 @@ - +
-

The screen could not be displayed.

-
-
+

{{ __('errors.403.desc') }}

+
+ {% endblock %} \ No newline at end of file diff --git a/resources/views/ctr/errors/404.twig b/resources/views/ctr/errors/404.twig index bc523e2..bb0fb3d 100644 --- a/resources/views/ctr/errors/404.twig +++ b/resources/views/ctr/errors/404.twig @@ -4,15 +4,15 @@ - +
-

The screen could not be displayed.

+

{{ __('errors.404.desc') }}

From a59e4aa5d13a230a01c3b428f9d9509ca978b618 Mon Sep 17 00:00:00 2001 From: Repflez Date: Tue, 15 May 2018 22:44:44 -0600 Subject: [PATCH 18/18] Add translation messages for gate --- resources/lang/en/gate.php | 41 +++++++++++++++++++++ resources/views/ctr/gate/welcome.twig | 38 +++++++++---------- resources/views/ctr/gate/welcome_guest.twig | 9 ++--- 3 files changed, 64 insertions(+), 24 deletions(-) create mode 100644 resources/lang/en/gate.php diff --git a/resources/lang/en/gate.php b/resources/lang/en/gate.php new file mode 100644 index 0000000..b64c672 --- /dev/null +++ b/resources/lang/en/gate.php @@ -0,0 +1,41 @@ + [ + 'controls' => [ + 'back' => 'Back', + 'close' => 'Close', + 'next' => 'Next', + ], + 'intro' => [ + 'title' => 'Welcome to :name!', + 'message' => ':name lets you share your in-game experiences with people from all over the world.', + ], + 'about' => [ + 'title' => 'About :name', + 'message1' => ':name is a recreation of Miiverse made by fans for fans.', + 'message2' => 'Since this is a recreation, it may not have the same features as the defunct Miiverse and we\'re working on making them available as soon as possible.', + ], + 'config' => [ + 'title' => 'Configuring your :name Account', + 'message' => 'We need some data from you before you can start using :name.', + 'display_name' => 'Display Name', + 'nnid' => 'Nintendo Network ID', + 'nnid_label' => 'We use your Nintendo Network ID to fetch your Mii image.', + ], + 'finish' => [ + 'title' => 'Have fun in :name!', + 'start' => 'Start', + ], + ], + + 'welcome_guest' => [ + 'title' => ':name is a gaming community that connects people from all over the world using Mii characters.
Use :name to share your gaming experiences and meet people from around the world.', + 'message' => 'You will need a Nintendo Network ID in order to create posts or create a profile. Select Link ID to link a new or existing ID.', + 'link' => 'Link ID', + 'exit' => 'Exit', + ], +]; \ No newline at end of file diff --git a/resources/views/ctr/gate/welcome.twig b/resources/views/ctr/gate/welcome.twig index cb31d7c..21c73ee 100644 --- a/resources/views/ctr/gate/welcome.twig +++ b/resources/views/ctr/gate/welcome.twig @@ -5,67 +5,67 @@
-

Welcome to {{ config('general.name') }}!

+

{{ __('gate.welcome.intro.title', { name: config('general.name') }) }}

-

{{ config('general.name') }} lets you share your in-game experiences with people from all over the world.

+

{{ __('gate.welcome.intro.message', { name: config('general.name') }) }}

- Close - Next + {{ __('gate.welcome.controls.close') }} + {{ __('gate.welcome.controls.next') }}