Merge pull request #96 from helios-ag/patch

various fixes

.travis.yml

@@ -1,21 +1,24 @@
-language: php
-
-php:
-  - 5.3.3
-  - 5.3
-  - 5.4
-  - 5.5
-
-
-matrix:
-  allow_failures:
-    - php: 5.5
-
-before_script:
-  - composer install --dev --prefer-source
-
-script: phpunit --coverage-text
-
-notifications:
-  email:
-    - [email protected]
+language: php
+
+php:
+  - 5.4
+  - 5.5
+  - 5.6
+  - hhvm
+
+
+matrix:
+  allow_failures:
+    - php: 5.6
+    - hhvm
+
+before_script:
+- travis_retry composer self-update
+- travis_retry composer install --dev --prefer-source
+
+script: phpunit --coverage-text
+
+notifications:
+  email:
+    - [email protected]
+

Command/DumpEmoticonsCommand.php

@@ -31,7 +31,7 @@ protected function configure()
      * @param $src
      * @param $dst
      */
-    private function recurse_copy($src,$dst)
+    private function recurseCopy($src,$dst)
     {
             $dir = opendir($src);
             @mkdir($dst);
@@ -62,11 +62,11 @@ protected function execute(InputInterface $input, OutputInterface $output)
 
         $emoticonsFolder = $this->getContainer()->getParameter('kernel.root_dir').$input->getOption('emoticons-folder');
 
-        if (!file_exists($emoticonsFolder) and !is_dir($emoticonsFolder)) {
+        if (!file_exists($emoticonsFolder) && !is_dir($emoticonsFolder)) {
             return $output->writeln('<error>Emoticons folder does not exist</error>');
         }
 
-        $this->recurse_copy($emoticonsFolder,$webFolder);
+        $this->recurseCopy($emoticonsFolder,$webFolder);
 
         $output->writeln('<comment>Emoticons dumped succesfully</comment>');
     }

Composer/ScriptHandler.php

@@ -2,7 +2,6 @@
 
 namespace FM\BbcodeBundle\Composer;
 
-use Symfony\Component\Process\Process;
 use Sensio\Bundle\DistributionBundle\Composer\ScriptHandler as BaseHandler;
 
 /**
@@ -21,3 +20,4 @@ public static function installEmoticons($event)
     }
 
 }
+

Decoda/Decoda.php

@@ -2,7 +2,6 @@
 
 namespace FM\BbcodeBundle\Decoda;
 
-use Decoda\Component;
 use Decoda\Loader\DataLoader;
 use Decoda\Loader;
 use Decoda\Hook;

Decoda/Hook/EmoticonHook.php

@@ -8,7 +8,6 @@
 
 use Symfony\Component\HttpKernel\CacheWarmer\CacheWarmerInterface;
 
-use Symfony\Component\Config\Resource\FileResource;
 use Symfony\Component\Config\ConfigCache;
 
 use Decoda\Decoda;

Emoticon/EmoticonCollection.php

@@ -185,4 +185,5 @@ public function addResource(ResourceInterface $resource)
     {
         $this->resources[] = $resource;
     }
-}
+}
+

Emoticon/Loader/YamlFileLoader.php

@@ -82,7 +82,7 @@ private function validate($content, $file)
         }
 
         if (!is_array($content)) {
-            throw new InvalidArgumentException(sprintf('The emoticon file "%s" is not valid.', $file));
+            throw new \InvalidArgumentException(sprintf('The emoticon file "%s" is not valid.', $file));
         }
 
         return $content;

Emoticon/Matcher/Matcher.php

@@ -52,4 +52,5 @@ public function getSmilies()
     {
         return $this->emoticons->getSmilies();
     }
-}
+}
+