From f57b58b212a4628860ed8273ca119944f8cdeb89 Mon Sep 17 00:00:00 2001 From: flashwave Date: Wed, 14 Mar 2018 00:24:38 +0100 Subject: [PATCH] switch over to phroute for now --- composer.json | 3 +- composer.lock | 384 +++++++++++++++++---------------- public/index.php | 11 +- routes.php | 26 ++- src/Application.php | 12 +- src/Controllers/Controller.php | 4 +- views/nova/auth/login.twig | 2 +- views/nova/home/landing.twig | 5 +- views/nova/master.twig | 6 +- 9 files changed, 234 insertions(+), 219 deletions(-) diff --git a/composer.json b/composer.json index 256d9f51..dc6c5540 100644 --- a/composer.json +++ b/composer.json @@ -9,8 +9,9 @@ "require": { "php": ">=7.2", "ext-bcmath": "*", - "flashwave/aitemu": "dev-master#7997543717d996b56938d5050ea497d62eb71f2e", + "ext-mbstring": "*", "twig/twig": "~2.4", + "phroute/phroute": "~2.1", "nesbot/carbon": "~1.22", "illuminate/database": "~5.5", "illuminate/filesystem": "~5.5", diff --git a/composer.lock b/composer.lock index 2d45e2e7..7cc54190 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": "0ea708fe797f9a4fdc6e049500fec2c3", + "content-hash": "ad8d5aadca5a1f854d58dd82131f701a", "packages": [ { "name": "composer/ca-bundle", @@ -419,20 +419,20 @@ }, { "name": "doctrine/inflector", - "version": "v1.2.0", + "version": "v1.3.0", "source": { "type": "git", "url": "https://github.com/doctrine/inflector.git", - "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462" + "reference": "5527a48b7313d15261292c149e55e26eae771b0a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/doctrine/inflector/zipball/e11d84c6e018beedd929cff5220969a3c6d1d462", - "reference": "e11d84c6e018beedd929cff5220969a3c6d1d462", + "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a", + "reference": "5527a48b7313d15261292c149e55e26eae771b0a", "shasum": "" }, "require": { - "php": "^7.0" + "php": "^7.1" }, "require-dev": { "phpunit/phpunit": "^6.2" @@ -440,7 +440,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.2.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { @@ -482,7 +482,7 @@ "singularize", "string" ], - "time": "2017-07-22T12:18:28+00:00" + "time": "2018-01-09T20:05:19+00:00" }, { "name": "doctrine/lexer", @@ -597,19 +597,20 @@ }, { "name": "erusev/parsedown", - "version": "1.6.4", + "version": "1.7.1", "source": { "type": "git", "url": "https://github.com/erusev/parsedown.git", - "reference": "fbe3fe878f4fe69048bb8a52783a09802004f548" + "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/fbe3fe878f4fe69048bb8a52783a09802004f548", - "reference": "fbe3fe878f4fe69048bb8a52783a09802004f548", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", + "reference": "92e9c27ba0e74b8b028b111d1b6f956a15c01fc1", "shasum": "" }, "require": { + "ext-mbstring": "*", "php": ">=5.3.0" }, "require-dev": { @@ -638,41 +639,7 @@ "markdown", "parser" ], - "time": "2017-11-14T20:44:03+00:00" - }, - { - "name": "flashwave/aitemu", - "version": "dev-master", - "source": { - "type": "git", - "url": "https://github.com/flashwave/aitemu.git", - "reference": "7997543717d996b56938d5050ea497d62eb71f2e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/flashwave/aitemu/zipball/7997543717d996b56938d5050ea497d62eb71f2e", - "reference": "7997543717d996b56938d5050ea497d62eb71f2e", - "shasum": "" - }, - "require": { - "php": ">=7.2" - }, - "require-dev": { - "phpunit/phpunit": "~6.0" - }, - "type": "library", - "autoload": { - "psr-4": { - "Aitemu\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "description": "PHP router library, mainly for personal use.", - "homepage": "https://github.com/flashwave/aitemu", - "time": "2018-01-03T15:36:23+00:00" + "time": "2018-03-08T01:11:30+00:00" }, { "name": "geoip2/geoip2", @@ -729,27 +696,27 @@ }, { "name": "illuminate/container", - "version": "v5.5.28", + "version": "v5.6.11", "source": { "type": "git", "url": "https://github.com/illuminate/container.git", - "reference": "a7095697649494ced03d33cf4e756ccee94f8ab2" + "reference": "4a42d667a05ec6d31f05b532cdac7e8e68e5ea2a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/container/zipball/a7095697649494ced03d33cf4e756ccee94f8ab2", - "reference": "a7095697649494ced03d33cf4e756ccee94f8ab2", + "url": "https://api.github.com/repos/illuminate/container/zipball/4a42d667a05ec6d31f05b532cdac7e8e68e5ea2a", + "reference": "4a42d667a05ec6d31f05b532cdac7e8e68e5ea2a", "shasum": "" }, "require": { - "illuminate/contracts": "5.5.*", - "php": ">=7.0", + "illuminate/contracts": "5.6.*", + "php": "^7.1.3", "psr/container": "~1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.5-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -769,31 +736,31 @@ ], "description": "The Illuminate Container package.", "homepage": "https://laravel.com", - "time": "2017-08-14T18:00:01+00:00" + "time": "2018-01-21T02:13:38+00:00" }, { "name": "illuminate/contracts", - "version": "v5.5.28", + "version": "v5.6.11", "source": { "type": "git", "url": "https://github.com/illuminate/contracts.git", - "reference": "03e9014d2091a30b025c895aa6d39c2755576ea5" + "reference": "00a8296c63b6429eb8705d2700c2436ea193c553" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/contracts/zipball/03e9014d2091a30b025c895aa6d39c2755576ea5", - "reference": "03e9014d2091a30b025c895aa6d39c2755576ea5", + "url": "https://api.github.com/repos/illuminate/contracts/zipball/00a8296c63b6429eb8705d2700c2436ea193c553", + "reference": "00a8296c63b6429eb8705d2700c2436ea193c553", "shasum": "" }, "require": { - "php": ">=7.0", + "php": "^7.1.3", "psr/container": "~1.0", "psr/simple-cache": "~1.0" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.5-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -813,40 +780,40 @@ ], "description": "The Illuminate Contracts package.", "homepage": "https://laravel.com", - "time": "2017-11-22T19:01:14+00:00" + "time": "2018-02-20T16:46:51+00:00" }, { "name": "illuminate/database", - "version": "v5.5.28", + "version": "v5.6.11", "source": { "type": "git", "url": "https://github.com/illuminate/database.git", - "reference": "e5f0c2ce642baf74fc126f0077032b13c50e8997" + "reference": "4d2fc3c816ed402fcac290e6ca7bc855d5313000" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/database/zipball/e5f0c2ce642baf74fc126f0077032b13c50e8997", - "reference": "e5f0c2ce642baf74fc126f0077032b13c50e8997", + "url": "https://api.github.com/repos/illuminate/database/zipball/4d2fc3c816ed402fcac290e6ca7bc855d5313000", + "reference": "4d2fc3c816ed402fcac290e6ca7bc855d5313000", "shasum": "" }, "require": { - "illuminate/container": "5.5.*", - "illuminate/contracts": "5.5.*", - "illuminate/support": "5.5.*", - "php": ">=7.0" + "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.5).", + "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.5.*).", - "illuminate/events": "Required to use the observers with Eloquent (5.5.*).", - "illuminate/filesystem": "Required to use the migrations (5.5.*).", - "illuminate/pagination": "Required to paginate the result set (5.5.*)." + "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.5-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -872,37 +839,38 @@ "orm", "sql" ], - "time": "2017-12-19T14:02:10+00:00" + "time": "2018-03-09T13:55:05+00:00" }, { "name": "illuminate/filesystem", - "version": "v5.5.28", + "version": "v5.6.11", "source": { "type": "git", "url": "https://github.com/illuminate/filesystem.git", - "reference": "505d1a1e4a4d6e05db7f4d54bb1c9668e0afc754" + "reference": "51680913527709ed509c857100302da4688b8637" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/filesystem/zipball/505d1a1e4a4d6e05db7f4d54bb1c9668e0afc754", - "reference": "505d1a1e4a4d6e05db7f4d54bb1c9668e0afc754", + "url": "https://api.github.com/repos/illuminate/filesystem/zipball/51680913527709ed509c857100302da4688b8637", + "reference": "51680913527709ed509c857100302da4688b8637", "shasum": "" }, "require": { - "illuminate/contracts": "5.5.*", - "illuminate/support": "5.5.*", - "php": ">=7.0", - "symfony/finder": "~3.3" + "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-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.5-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -922,31 +890,31 @@ ], "description": "The Illuminate Filesystem package.", "homepage": "https://laravel.com", - "time": "2017-12-14T13:33:54+00:00" + "time": "2018-03-05T13:55:50+00:00" }, { "name": "illuminate/pagination", - "version": "v5.5.28", + "version": "v5.6.11", "source": { "type": "git", "url": "https://github.com/illuminate/pagination.git", - "reference": "90e59fedc7d4760db5d85d66a59507ceac0bf354" + "reference": "6b9b1def1347430a31e7519d381e2f14a55a97dd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/pagination/zipball/90e59fedc7d4760db5d85d66a59507ceac0bf354", - "reference": "90e59fedc7d4760db5d85d66a59507ceac0bf354", + "url": "https://api.github.com/repos/illuminate/pagination/zipball/6b9b1def1347430a31e7519d381e2f14a55a97dd", + "reference": "6b9b1def1347430a31e7519d381e2f14a55a97dd", "shasum": "" }, "require": { - "illuminate/contracts": "5.5.*", - "illuminate/support": "5.5.*", - "php": ">=7.0" + "illuminate/contracts": "5.6.*", + "illuminate/support": "5.6.*", + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.5-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -966,41 +934,41 @@ ], "description": "The Illuminate Pagination package.", "homepage": "https://laravel.com", - "time": "2017-10-13T15:07:13+00:00" + "time": "2018-02-12T14:12:25+00:00" }, { "name": "illuminate/support", - "version": "v5.5.28", + "version": "v5.6.11", "source": { "type": "git", "url": "https://github.com/illuminate/support.git", - "reference": "4db3cc82b483172b1b25d9dfcec684927f5c8cf9" + "reference": "259f6f17a11b0379340ec5311fcba27bc2a04070" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/illuminate/support/zipball/4db3cc82b483172b1b25d9dfcec684927f5c8cf9", - "reference": "4db3cc82b483172b1b25d9dfcec684927f5c8cf9", + "url": "https://api.github.com/repos/illuminate/support/zipball/259f6f17a11b0379340ec5311fcba27bc2a04070", + "reference": "259f6f17a11b0379340ec5311fcba27bc2a04070", "shasum": "" }, "require": { "doctrine/inflector": "~1.1", "ext-mbstring": "*", - "illuminate/contracts": "5.5.*", + "illuminate/contracts": "5.6.*", "nesbot/carbon": "^1.20", - "php": ">=7.0" + "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.*).", - "symfony/process": "Required to use the composer class (~3.3).", - "symfony/var-dumper": "Required to use the dd function (~3.3)." + "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.5-dev" + "dev-master": "5.6-dev" } }, "autoload": { @@ -1023,7 +991,7 @@ ], "description": "The Illuminate Support package.", "homepage": "https://laravel.com", - "time": "2017-12-24T20:02:59+00:00" + "time": "2018-03-09T16:52:54+00:00" }, { "name": "maxmind-db/reader", @@ -1129,25 +1097,25 @@ }, { "name": "nesbot/carbon", - "version": "1.22.1", + "version": "1.24.2", "source": { "type": "git", "url": "https://github.com/briannesbitt/Carbon.git", - "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc" + "reference": "bba6c6e410c6b4317e37a9474aeaa753808c3875" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc", - "reference": "7cdf42c0b1cc763ab7e4c33c47a24e27c66bfccc", + "url": "https://api.github.com/repos/briannesbitt/Carbon/zipball/bba6c6e410c6b4317e37a9474aeaa753808c3875", + "reference": "bba6c6e410c6b4317e37a9474aeaa753808c3875", "shasum": "" }, "require": { - "php": ">=5.3.0", - "symfony/translation": "~2.6 || ~3.0" + "php": ">=5.3.9", + "symfony/translation": "~2.6 || ~3.0 || ~4.0" }, "require-dev": { "friendsofphp/php-cs-fixer": "~2", - "phpunit/phpunit": "~4.0 || ~5.0" + "phpunit/phpunit": "^4.8.35 || ^5.7" }, "type": "library", "extra": { @@ -1178,7 +1146,51 @@ "datetime", "time" ], - "time": "2017-01-16T07:55:07+00:00" + "time": "2018-03-10T10:10:14+00:00" + }, + { + "name": "phroute/phroute", + "version": "v2.1.0", + "source": { + "type": "git", + "url": "https://github.com/mrjgreen/phroute.git", + "reference": "dbe2b986f9ee1dd33dc956fcc35d1fa22e8e196c" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/mrjgreen/phroute/zipball/dbe2b986f9ee1dd33dc956fcc35d1fa22e8e196c", + "reference": "dbe2b986f9ee1dd33dc956fcc35d1fa22e8e196c", + "shasum": "" + }, + "require": { + "php": ">=5.4.0" + }, + "require-dev": { + "phpunit/phpunit": "*", + "satooshi/php-coveralls": "dev-master" + }, + "type": "library", + "autoload": { + "psr-4": { + "Phroute\\Phroute\\": "src/Phroute" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Joe Green", + "email": "joe.green.0991@gmail.com" + } + ], + "description": "Fast, fully featured restful request router for PHP", + "keywords": [ + "router", + "routing" + ], + "time": "2015-07-22T20:46:43+00:00" }, { "name": "psr/container", @@ -1231,16 +1243,16 @@ }, { "name": "psr/simple-cache", - "version": "1.0.0", + "version": "1.0.1", "source": { "type": "git", "url": "https://github.com/php-fig/simple-cache.git", - "reference": "753fa598e8f3b9966c886fe13f370baa45ef0e24" + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/753fa598e8f3b9966c886fe13f370baa45ef0e24", - "reference": "753fa598e8f3b9966c886fe13f370baa45ef0e24", + "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", + "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b", "shasum": "" }, "require": { @@ -1275,7 +1287,7 @@ "psr-16", "simple-cache" ], - "time": "2017-01-02T13:31:39+00:00" + "time": "2017-10-23T01:57:42+00:00" }, { "name": "swiftmailer/swiftmailer", @@ -1334,25 +1346,25 @@ }, { "name": "symfony/finder", - "version": "v3.4.2", + "version": "v4.0.6", "source": { "type": "git", "url": "https://github.com/symfony/finder.git", - "reference": "dac8d7db537bac7ad8143eb11360a8c2231f251a" + "reference": "44a796d2ecc2a16a5fc8f2956a34ee617934d55f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/finder/zipball/dac8d7db537bac7ad8143eb11360a8c2231f251a", - "reference": "dac8d7db537bac7ad8143eb11360a8c2231f251a", + "url": "https://api.github.com/repos/symfony/finder/zipball/44a796d2ecc2a16a5fc8f2956a34ee617934d55f", + "reference": "44a796d2ecc2a16a5fc8f2956a34ee617934d55f", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8" + "php": "^7.1.3" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1379,20 +1391,20 @@ ], "description": "Symfony Finder Component", "homepage": "https://symfony.com", - "time": "2017-11-05T16:10:10+00:00" + "time": "2018-03-05T18:28:26+00:00" }, { "name": "symfony/polyfill-mbstring", - "version": "v1.6.0", + "version": "v1.7.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-mbstring.git", - "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296" + "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", - "reference": "2ec8b39c38cb16674bbf3fea2b6ce5bf117e1296", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b", + "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b", "shasum": "" }, "require": { @@ -1404,7 +1416,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.6-dev" + "dev-master": "1.7-dev" } }, "autoload": { @@ -1438,37 +1450,37 @@ "portable", "shim" ], - "time": "2017-10-11T12:05:26+00:00" + "time": "2018-01-30T19:27:44+00:00" }, { "name": "symfony/translation", - "version": "v3.4.2", + "version": "v4.0.6", "source": { "type": "git", "url": "https://github.com/symfony/translation.git", - "reference": "4c5d5582baf2829751a5207659329c1f52eedeb6" + "reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/translation/zipball/4c5d5582baf2829751a5207659329c1f52eedeb6", - "reference": "4c5d5582baf2829751a5207659329c1f52eedeb6", + "url": "https://api.github.com/repos/symfony/translation/zipball/e20a9b7f9f62cb33a11638b345c248e7d510c938", + "reference": "e20a9b7f9f62cb33a11638b345c248e7d510c938", "shasum": "" }, "require": { - "php": "^5.5.9|>=7.0.8", + "php": "^7.1.3", "symfony/polyfill-mbstring": "~1.0" }, "conflict": { - "symfony/config": "<2.8", + "symfony/config": "<3.4", "symfony/dependency-injection": "<3.4", "symfony/yaml": "<3.4" }, "require-dev": { "psr/log": "~1.0", - "symfony/config": "~2.8|~3.0|~4.0", + "symfony/config": "~3.4|~4.0", "symfony/dependency-injection": "~3.4|~4.0", "symfony/finder": "~2.8|~3.0|~4.0", - "symfony/intl": "^2.8.18|^3.2.5|~4.0", + "symfony/intl": "~3.4|~4.0", "symfony/yaml": "~3.4|~4.0" }, "suggest": { @@ -1479,7 +1491,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "3.4-dev" + "dev-master": "4.0-dev" } }, "autoload": { @@ -1506,20 +1518,20 @@ ], "description": "Symfony Translation Component", "homepage": "https://symfony.com", - "time": "2017-12-12T08:27:14+00:00" + "time": "2018-02-22T10:50:29+00:00" }, { "name": "twig/twig", - "version": "v2.4.4", + "version": "v2.4.6", "source": { "type": "git", "url": "https://github.com/twigphp/Twig.git", - "reference": "eddb97148ad779f27e670e1e3f19fb323aedafeb" + "reference": "d2117ec118c1ff3d28ccddca8212d82787a4809f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/twigphp/Twig/zipball/eddb97148ad779f27e670e1e3f19fb323aedafeb", - "reference": "eddb97148ad779f27e670e1e3f19fb323aedafeb", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/d2117ec118c1ff3d28ccddca8212d82787a4809f", + "reference": "d2117ec118c1ff3d28ccddca8212d82787a4809f", "shasum": "" }, "require": { @@ -1572,7 +1584,7 @@ "keywords": [ "templating" ], - "time": "2017-09-27T18:10:31+00:00" + "time": "2018-03-03T16:23:01+00:00" } ], "packages-dev": [ @@ -1833,16 +1845,16 @@ }, { "name": "phpdocumentor/reflection-docblock", - "version": "4.2.0", + "version": "4.3.0", "source": { "type": "git", "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", - "reference": "66465776cfc249844bde6d117abff1d22e06c2da" + "reference": "94fd0001232e47129dd3504189fa1c7225010d08" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/66465776cfc249844bde6d117abff1d22e06c2da", - "reference": "66465776cfc249844bde6d117abff1d22e06c2da", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08", + "reference": "94fd0001232e47129dd3504189fa1c7225010d08", "shasum": "" }, "require": { @@ -1880,7 +1892,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-27T17:38:31+00:00" + "time": "2017-11-30T07:14:17+00:00" }, { "name": "phpdocumentor/type-resolver", @@ -1931,16 +1943,16 @@ }, { "name": "phpspec/prophecy", - "version": "1.7.3", + "version": "1.7.5", "source": { "type": "git", "url": "https://github.com/phpspec/prophecy.git", - "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf" + "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/phpspec/prophecy/zipball/e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", - "reference": "e4ed002c67da8eceb0eb8ddb8b3847bb53c5c2bf", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/dfd6be44111a7c41c2e884a336cc4f461b3b2401", + "reference": "dfd6be44111a7c41c2e884a336cc4f461b3b2401", "shasum": "" }, "require": { @@ -1952,7 +1964,7 @@ }, "require-dev": { "phpspec/phpspec": "^2.5|^3.2", - "phpunit/phpunit": "^4.8.35 || ^5.7" + "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5" }, "type": "library", "extra": { @@ -1990,7 +2002,7 @@ "spy", "stub" ], - "time": "2017-11-24T13:59:53+00:00" + "time": "2018-02-19T10:16:54+00:00" }, { "name": "phpunit/php-code-coverage", @@ -2243,16 +2255,16 @@ }, { "name": "phpunit/phpunit", - "version": "6.5.5", + "version": "6.5.7", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit.git", - "reference": "83d27937a310f2984fd575686138597147bdc7df" + "reference": "6bd77b57707c236833d2b57b968e403df060c9d9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/83d27937a310f2984fd575686138597147bdc7df", - "reference": "83d27937a310f2984fd575686138597147bdc7df", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6bd77b57707c236833d2b57b968e403df060c9d9", + "reference": "6bd77b57707c236833d2b57b968e403df060c9d9", "shasum": "" }, "require": { @@ -2323,20 +2335,20 @@ "testing", "xunit" ], - "time": "2017-12-17T06:31:19+00:00" + "time": "2018-02-26T07:01:09+00:00" }, { "name": "phpunit/phpunit-mock-objects", - "version": "5.0.5", + "version": "5.0.6", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", - "reference": "283b9f4f670e3a6fd6c4ff95c51a952eb5c75933" + "reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/283b9f4f670e3a6fd6c4ff95c51a952eb5c75933", - "reference": "283b9f4f670e3a6fd6c4ff95c51a952eb5c75933", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/33fd41a76e746b8fa96d00b49a23dadfa8334cdf", + "reference": "33fd41a76e746b8fa96d00b49a23dadfa8334cdf", "shasum": "" }, "require": { @@ -2382,7 +2394,7 @@ "mock", "xunit" ], - "time": "2017-12-10T08:01:53+00:00" + "time": "2018-01-06T05:45:45+00:00" }, { "name": "sebastian/code-unit-reverse-lookup", @@ -2431,21 +2443,21 @@ }, { "name": "sebastian/comparator", - "version": "2.1.1", + "version": "2.1.3", "source": { "type": "git", "url": "https://github.com/sebastianbergmann/comparator.git", - "reference": "b11c729f95109b56a0fe9650c6a63a0fcd8c439f" + "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/b11c729f95109b56a0fe9650c6a63a0fcd8c439f", - "reference": "b11c729f95109b56a0fe9650c6a63a0fcd8c439f", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/34369daee48eafb2651bea869b4b15d75ccc35f9", + "reference": "34369daee48eafb2651bea869b4b15d75ccc35f9", "shasum": "" }, "require": { "php": "^7.0", - "sebastian/diff": "^2.0", + "sebastian/diff": "^2.0 || ^3.0", "sebastian/exporter": "^3.1" }, "require-dev": { @@ -2491,7 +2503,7 @@ "compare", "equality" ], - "time": "2017-12-22T14:50:35+00:00" + "time": "2018-02-01T13:46:46+00:00" }, { "name": "sebastian/diff", @@ -2985,16 +2997,16 @@ }, { "name": "webmozart/assert", - "version": "1.2.0", + "version": "1.3.0", "source": { "type": "git", "url": "https://github.com/webmozart/assert.git", - "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f" + "reference": "0df1908962e7a3071564e857d86874dad1ef204a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/webmozart/assert/zipball/2db61e59ff05fe5126d152bd0655c9ea113e550f", - "reference": "2db61e59ff05fe5126d152bd0655c9ea113e550f", + "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a", + "reference": "0df1908962e7a3071564e857d86874dad1ef204a", "shasum": "" }, "require": { @@ -3031,18 +3043,18 @@ "check", "validate" ], - "time": "2016-11-23T20:04:58+00:00" + "time": "2018-01-29T19:49:41+00:00" } ], "aliases": [], "minimum-stability": "stable", - "stability-flags": { - "flashwave/aitemu": 20 - }, + "stability-flags": [], "prefer-stable": false, "prefer-lowest": false, "platform": { - "php": ">=7.2" + "php": ">=7.2", + "ext-bcmath": "*", + "ext-mbstring": "*" }, "platform-dev": [] } diff --git a/public/index.php b/public/index.php index 81d346b8..a2b1fff0 100644 --- a/public/index.php +++ b/public/index.php @@ -1,7 +1,7 @@ startSession((int)$_COOKIE['msz_uid'], $_COOKIE['msz_sid']); } -$app->startRouter(include __DIR__ . '/../routes.php'); +$app->startRouter(); $app->startTemplating(); -echo $app->router->resolve( - RouterRequest::fromServer($_SERVER, $_GET, $_POST, $_COOKIE) +include __DIR__ . '/../routes.php'; + +echo (new Dispatcher($app->router->getData()))->dispatch( + $_SERVER['REQUEST_METHOD'], + parse_url($_SERVER['REQUEST_URI'], PHP_URL_PATH) ); diff --git a/routes.php b/routes.php index a60ba3f6..e7b23a01 100644 --- a/routes.php +++ b/routes.php @@ -1,17 +1,23 @@ router; - Route::get('/auth/login', 'login', AuthController::class), - Route::post('/auth/login', 'login', AuthController::class), - Route::get('/auth/register', 'register', AuthController::class), - Route::post('/auth/register', 'register', AuthController::class), - Route::get('/auth/logout', 'logout', AuthController::class), +$routes->get(['/', 'main.index'], [HomeController::class, 'index']); - Route::get('/users/{id:i}', 'view', UserController::class), -]; +$routes->group(['prefix' => '/auth'], function ($routes) { + $routes->get(['/login', 'auth.login'], [AuthController::class, 'login']); + $routes->post(['/login', 'auth.login'], [AuthController::class, 'login']); + + $routes->get(['/logout', 'auth.logout'], [AuthController::class, 'logout']); + + $routes->get(['/register', 'auth.register'], [AuthController::class, 'register']); + $routes->post(['/register', 'auth.register'], [AuthController::class, 'register']); +}); + +$routes->group(['prefix' => '/users'], function ($routes) { + $routes->get(['/{id:i}', 'users.view'], [UserController::class, 'view']); +}); diff --git a/src/Application.php b/src/Application.php index 4b016c2f..be08578a 100644 --- a/src/Application.php +++ b/src/Application.php @@ -1,9 +1,9 @@ addFunction('byte_symbol'); $twig->addFunction('session_id'); $twig->addFunction('config', [$this->config, 'get']); - $twig->addFunction('route', [$this->router, 'url']); + $twig->addFunction('route', [$this->router, 'route']); $twig->addFunction('git_hash', [Application::class, 'gitCommitHash']); $twig->addFunction('git_branch', [Application::class, 'gitBranch']); @@ -136,16 +136,12 @@ class Application extends ApplicationBase /** * Sets up the router module. */ - public function startRouter(array $routes = null): void + public function startRouter(): void { if ($this->hasRouter) { throw new UnexpectedValueException('Router module has already been started.'); } - $this->addModule('router', $router = new RouteCollection); - - if ($routes !== null) { - $router->add($routes); - } + $this->addModule('router', new RouteCollector); } } diff --git a/src/Controllers/Controller.php b/src/Controllers/Controller.php index 0ba9b89b..73d3c025 100644 --- a/src/Controllers/Controller.php +++ b/src/Controllers/Controller.php @@ -1,8 +1,6 @@
- +
diff --git a/views/nova/home/landing.twig b/views/nova/home/landing.twig index d5d556a4..8c20c5f1 100644 --- a/views/nova/home/landing.twig +++ b/views/nova/home/landing.twig @@ -6,11 +6,10 @@
{% if app.session is null %}
- register - login + register + login
-

Registration soon, but not now.

Keep an eye on Twitter!

{% else %} diff --git a/views/nova/master.twig b/views/nova/master.twig index 6868c08c..35f24852 100644 --- a/views/nova/master.twig +++ b/views/nova/master.twig @@ -16,13 +16,13 @@