From cc0725e6e20b14d834bafa3d57c12bc68eabc51e Mon Sep 17 00:00:00 2001 From: Albert Ganiev Date: Fri, 15 May 2015 12:16:32 +1000 Subject: [PATCH 1/2] fix composer script and readme ttypo --- Composer/ScriptHandler.php | 9 ++++++--- README.md | 25 +++++++++---------------- 2 files changed, 15 insertions(+), 19 deletions(-) diff --git a/Composer/ScriptHandler.php b/Composer/ScriptHandler.php index c30405d..fdbc185 100644 --- a/Composer/ScriptHandler.php +++ b/Composer/ScriptHandler.php @@ -4,6 +4,8 @@ use Sensio\Bundle\DistributionBundle\Composer\ScriptHandler as BaseHandler; +use Composer\Script\CommandEvent; + /** * @author Al Ganiev, original from LiipMonitorBundle by @pulse00 * Composer ScriptHandler can be used to run postInstall/postUpdate dump emoticons @@ -11,12 +13,13 @@ */ class ScriptHandler extends BaseHandler { - public static function installEmoticons($event) + public static function installEmoticons(CommandEvent $event) { $options = self::getOptions($event); - $appDir = $options['symfony-app-dir']; + // use Symfony 3.0 dir structure if available + $consoleDir = isset($options['symfony-bin-dir']) ? $options['symfony-bin-dir'] : $options['symfony-app-dir']; $event->getIO()->write('Dumping emoticons...'); - static::executeCommand($event, $appDir, 'bbcode:dump'); + static::executeCommand($event, $consoleDir, 'bbcode:dump'); } } diff --git a/README.md b/README.md index e72db85..4b8b5a6 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,14 @@ FMBBCodeBundle ============== +[![Build Status](https://travis-ci.org/helios-ag/FMBbCodeBundle.png?branch=master)](https://travis-ci.org/helios-ag/FMBbCodeBundle) +[![Total Downloads](https://poser.pugx.org/helios-ag/fm-bbcode-bundle/d/total.png)](https://packagist.org/packages/helios-ag/fm-bbcode-bundle) +[![Latest Stable Version](https://poser.pugx.org/helios-ag/fm-bbcode-bundle/version.png)](https://packagist.org/packages/helios-ag/fm-bbcode-bundle) +[![Dependency Status](https://www.versioneye.com/user/projects/53db56c04b3ac87d6a000207/badge.svg?style=flat)](https://www.versioneye.com/user/projects/53db56c04b3ac87d6a000207) + [PHP-Decoda](https://github.com/milesj/decoda) integration in Symfony2 A lightweight lexical string parser for BBCode styled markup. -### Gitter chat ### - -[![Join the chat at https://gitter.im/helios-ag/FMBbCodeBundle](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/helios-ag/FMBbCodeBundle?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) - -### Code Quality Assurance ### - -| SensioLabs Insight | Travis CI | Scrutinizer CI| -| ------------------------|-------------|-----------------| -| [![SensioLabsInsight](https://insight.sensiolabs.com/projects/f355c58b-f9b6-482c-8d2d-d1bc8791c9e5/big.png)](https://insight.sensiolabs.com/projects/f355c58b-f9b6-482c-8d2d-d1bc8791c9e5) |[![Build Status](https://travis-ci.org/helios-ag/FMBbCodeBundle.png?branch=master)](https://travis-ci.org/helios-ag/FMBbCodeBundle)|[![Build Status](https://scrutinizer-ci.com/g/helios-ag/FMBbCodeBundle/badges/build.png?b=scrutinizer-enabled)](https://scrutinizer-ci.com/g/helios-ag/FMBbCodeBundle/build-status/scrutinizer-enabled)[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/helios-ag/FMBbCodeBundle/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/helios-ag/FMBbCodeBundle/?branch=master) [![Code Coverage](https://scrutinizer-ci.com/g/helios-ag/FMBbCodeBundle/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/helios-ag/FMBbCodeBundle/?branch=master) - -[![Dependency Status](https://www.versioneye.com/user/projects/53db56c04b3ac87d6a000207/badge.svg?style=flat)](https://www.versioneye.com/user/projects/53db56c04b3ac87d6a000207) -[![Latest Stable Version](https://poser.pugx.org/helios-ag/fm-bbcode-bundle/version.png)](https://packagist.org/packages/helios-ag/fm-bbcode-bundle) -[![Total Downloads](https://poser.pugx.org/helios-ag/fm-bbcode-bundle/d/total.png)](https://packagist.org/packages/helios-ag/fm-bbcode-bundle) - ## Installation @@ -32,7 +23,7 @@ Or you can use composer to install this bundle: Add FMBbcodeBundle in your composer.json: ```sh - composer require helios-ag/fm-bbcode-bundle + composer require helios-ag/fm-elfinder-bundle ``` Now tell composer to download the bundle by running the command: @@ -249,7 +240,7 @@ Add the following commands to you projects composer.json: } ``` -To custumize emoticons assets folders, use `path` and `folder` node configuration: +To customize emoticons assets folders, use `path` and `folder` node configuration: ```yaml # app/config.yml @@ -271,3 +262,5 @@ fm_bbcode: * [predakanga](https://github.com/predakanga) * Dan [piratadelfuturo](https://github.com/piratadelfuturo) * Alexandre Quercia [alquerci](https://github.com/alquerci) + + From 417cc15aa95976d1a1c6ea6464769e088ce495e5 Mon Sep 17 00:00:00 2001 From: Albert Ganiev Date: Fri, 15 May 2015 12:23:14 +1000 Subject: [PATCH 2/2] Readme(return badges) --- README.md | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 4b8b5a6..62a7321 100644 --- a/README.md +++ b/README.md @@ -1,14 +1,23 @@ FMBBCodeBundle ============== -[![Build Status](https://travis-ci.org/helios-ag/FMBbCodeBundle.png?branch=master)](https://travis-ci.org/helios-ag/FMBbCodeBundle) -[![Total Downloads](https://poser.pugx.org/helios-ag/fm-bbcode-bundle/d/total.png)](https://packagist.org/packages/helios-ag/fm-bbcode-bundle) -[![Latest Stable Version](https://poser.pugx.org/helios-ag/fm-bbcode-bundle/version.png)](https://packagist.org/packages/helios-ag/fm-bbcode-bundle) -[![Dependency Status](https://www.versioneye.com/user/projects/53db56c04b3ac87d6a000207/badge.svg?style=flat)](https://www.versioneye.com/user/projects/53db56c04b3ac87d6a000207) - [PHP-Decoda](https://github.com/milesj/decoda) integration in Symfony2 A lightweight lexical string parser for BBCode styled markup. +### Gitter chat ### + +[![Join the chat at https://gitter.im/helios-ag/FMBbCodeBundle](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/helios-ag/FMBbCodeBundle?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) + +### Code Quality Assurance ### + +| SensioLabs Insight | Travis CI | Scrutinizer CI| +| ------------------------|-------------|-----------------| +| [![SensioLabsInsight](https://insight.sensiolabs.com/projects/f355c58b-f9b6-482c-8d2d-d1bc8791c9e5/big.png)](https://insight.sensiolabs.com/projects/f355c58b-f9b6-482c-8d2d-d1bc8791c9e5) |[![Build Status](https://travis-ci.org/helios-ag/FMBbCodeBundle.png?branch=master)](https://travis-ci.org/helios-ag/FMBbCodeBundle)|[![Build Status](https://scrutinizer-ci.com/g/helios-ag/FMBbCodeBundle/badges/build.png?b=scrutinizer-enabled)](https://scrutinizer-ci.com/g/helios-ag/FMBbCodeBundle/build-status/scrutinizer-enabled)[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/helios-ag/FMBbCodeBundle/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/helios-ag/FMBbCodeBundle/?branch=master) [![Code Coverage](https://scrutinizer-ci.com/g/helios-ag/FMBbCodeBundle/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/helios-ag/FMBbCodeBundle/?branch=master) + +[![Dependency Status](https://www.versioneye.com/user/projects/53db56c04b3ac87d6a000207/badge.svg?style=flat)](https://www.versioneye.com/user/projects/53db56c04b3ac87d6a000207) +[![Latest Stable Version](https://poser.pugx.org/helios-ag/fm-bbcode-bundle/version.png)](https://packagist.org/packages/helios-ag/fm-bbcode-bundle) +[![Total Downloads](https://poser.pugx.org/helios-ag/fm-bbcode-bundle/d/total.png)](https://packagist.org/packages/helios-ag/fm-bbcode-bundle) + ## Installation @@ -23,7 +32,7 @@ Or you can use composer to install this bundle: Add FMBbcodeBundle in your composer.json: ```sh - composer require helios-ag/fm-elfinder-bundle + composer require helios-ag/fm-bbcode-bundle ``` Now tell composer to download the bundle by running the command: @@ -263,4 +272,3 @@ fm_bbcode: * Dan [piratadelfuturo](https://github.com/piratadelfuturo) * Alexandre Quercia [alquerci](https://github.com/alquerci) -