From e824f5ebf70131997e3177638a323d210be8a14a Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sat, 3 Oct 2015 16:51:29 +0930 Subject: [PATCH] Update for composer branch --- extensions/tags/bootstrap.php | 18 ++++++++-- extensions/tags/composer.json | 25 +++++++++++-- extensions/tags/flarum.json | 25 ------------- ...4_000000_create_discussions_tags_table.php | 2 +- .../2015_02_24_000000_create_tags_table.php | 2 +- ...5_02_24_000000_create_users_tags_table.php | 2 +- ...2015_02_24_000000_set_default_settings.php | 2 +- extensions/tags/src/Extension.php | 35 ------------------- 8 files changed, 42 insertions(+), 69 deletions(-) delete mode 100644 extensions/tags/flarum.json delete mode 100644 extensions/tags/src/Extension.php diff --git a/extensions/tags/bootstrap.php b/extensions/tags/bootstrap.php index 36cbb94e5..4e5fadac0 100644 --- a/extensions/tags/bootstrap.php +++ b/extensions/tags/bootstrap.php @@ -9,6 +9,20 @@ * file that was distributed with this source code. */ -require __DIR__.'/vendor/autoload.php'; +use Flarum\Core\Application; -return 'Flarum\Tags\Extension'; +return function (Application $app) { + Flarum\Tags\Tag::setValidator($app->make('validator')); + + $events = $app->make('events'); + + $events->subscribe('Flarum\Tags\Listeners\AddClientAssets'); + $events->subscribe('Flarum\Tags\Listeners\AddModelRelationship'); + $events->subscribe('Flarum\Tags\Listeners\ConfigureDiscussionPermissions'); + $events->subscribe('Flarum\Tags\Listeners\ConfigureTagPermissions'); + $events->subscribe('Flarum\Tags\Listeners\AddApiAttributes'); + $events->subscribe('Flarum\Tags\Listeners\PersistData'); + $events->subscribe('Flarum\Tags\Listeners\LogDiscussionTagged'); + $events->subscribe('Flarum\Tags\Listeners\UpdateTagMetadata'); + $events->subscribe('Flarum\Tags\Listeners\AddTagGambit'); +}; diff --git a/extensions/tags/composer.json b/extensions/tags/composer.json index cb1c4db8c..221dc7fc4 100644 --- a/extensions/tags/composer.json +++ b/extensions/tags/composer.json @@ -1,10 +1,29 @@ { + "name": "flarum/tags", + "type": "flarum-extension", + "description": "Organise discussions into a heirarchy of tags and categories.", "autoload": { "psr-4": { "Flarum\\Tags\\": "src/" } }, - "scripts": { - "style": "phpcs --standard=PSR2 -np src" - } + "require": { + "composer/installers": "dev-master" + }, + "extra": { + "flarum-extension": { + "title": "Tags", + "icon": { + "name": "tags", + "backgroundColor": "#F28326", + "color": "#fff" + } + } + }, + "repositories": [ + { + "type": "vcs", + "url": "https://github.com/tobscure/installers" + } + ] } diff --git a/extensions/tags/flarum.json b/extensions/tags/flarum.json deleted file mode 100644 index 56fe6f120..000000000 --- a/extensions/tags/flarum.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "tags", - "title": "Tags", - "description": "Organise discussions into a heirarchy of tags and categories.", - "keywords": ["discussions"], - "version": "0.1.0-beta.2", - "author": { - "name": "Toby Zerner", - "email": "toby@flarum.org", - "homepage": "http://tobyzerner.com" - }, - "license": "MIT", - "require": { - "flarum": ">=0.1.0-beta.2" - }, - "support": { - "source": "https://github.com/flarum/tags", - "issues": "https://github.com/flarum/core/issues" - }, - "icon": { - "name": "tags", - "backgroundColor": "#F28326", - "color": "#fff" - } -} diff --git a/extensions/tags/migrations/2015_02_24_000000_create_discussions_tags_table.php b/extensions/tags/migrations/2015_02_24_000000_create_discussions_tags_table.php index 6b6669a04..1b7f6f16a 100644 --- a/extensions/tags/migrations/2015_02_24_000000_create_discussions_tags_table.php +++ b/extensions/tags/migrations/2015_02_24_000000_create_discussions_tags_table.php @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Migrations\Tags; +namespace Flarum\Tags\Migrations; use Illuminate\Database\Schema\Blueprint; use Flarum\Migrations\Migration; diff --git a/extensions/tags/migrations/2015_02_24_000000_create_tags_table.php b/extensions/tags/migrations/2015_02_24_000000_create_tags_table.php index efcbd6c1c..a44b7482c 100644 --- a/extensions/tags/migrations/2015_02_24_000000_create_tags_table.php +++ b/extensions/tags/migrations/2015_02_24_000000_create_tags_table.php @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Migrations\Tags; +namespace Flarum\Tags\Migrations; use Illuminate\Database\Schema\Blueprint; use Flarum\Migrations\Migration; diff --git a/extensions/tags/migrations/2015_02_24_000000_create_users_tags_table.php b/extensions/tags/migrations/2015_02_24_000000_create_users_tags_table.php index b6159317c..34182f186 100644 --- a/extensions/tags/migrations/2015_02_24_000000_create_users_tags_table.php +++ b/extensions/tags/migrations/2015_02_24_000000_create_users_tags_table.php @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Migrations\Tags; +namespace Flarum\Tags\Migrations; use Illuminate\Database\Schema\Blueprint; use Flarum\Migrations\Migration; diff --git a/extensions/tags/migrations/2015_02_24_000000_set_default_settings.php b/extensions/tags/migrations/2015_02_24_000000_set_default_settings.php index 9ee45b1cd..6737d8252 100644 --- a/extensions/tags/migrations/2015_02_24_000000_set_default_settings.php +++ b/extensions/tags/migrations/2015_02_24_000000_set_default_settings.php @@ -8,7 +8,7 @@ * file that was distributed with this source code. */ -namespace Flarum\Migrations\Tags; +namespace Flarum\Tags\Migrations; use Flarum\Migrations\Migration; diff --git a/extensions/tags/src/Extension.php b/extensions/tags/src/Extension.php deleted file mode 100644 index 38217a1ef..000000000 --- a/extensions/tags/src/Extension.php +++ /dev/null @@ -1,35 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Flarum\Tags; - -use Flarum\Support\Extension as BaseExtension; -use Illuminate\Events\Dispatcher; - -class Extension extends BaseExtension -{ - public function listen(Dispatcher $events) - { - $events->subscribe('Flarum\Tags\Listeners\AddClientAssets'); - $events->subscribe('Flarum\Tags\Listeners\AddModelRelationship'); - $events->subscribe('Flarum\Tags\Listeners\ConfigureDiscussionPermissions'); - $events->subscribe('Flarum\Tags\Listeners\ConfigureTagPermissions'); - $events->subscribe('Flarum\Tags\Listeners\AddApiAttributes'); - $events->subscribe('Flarum\Tags\Listeners\PersistData'); - $events->subscribe('Flarum\Tags\Listeners\LogDiscussionTagged'); - $events->subscribe('Flarum\Tags\Listeners\UpdateTagMetadata'); - $events->subscribe('Flarum\Tags\Listeners\AddTagGambit'); - } - - public function boot() - { - Tag::setValidator($this->app->make('validator')); - } -}