Merge pull request #73 from thunderer/quality-of-life

Quality improvements

Author: thunderer

.travis.yml

@@ -1,12 +1,14 @@
 language: php
 
 php:
+  - 5.3
   - 5.4
   - 5.5
   - 5.6
   - 7.0
   - 7.1
   - 7.2
+  - 7.3
   - hhvm
   - nightly
 
@@ -24,5 +26,7 @@ after_script:
 
 matrix:
   allow_failures:
+    - php: 5.3
+    - php: hhvm
     - php: nightly
     - php: hhvm

Makefile

@@ -0,0 +1,13 @@
+PHP ?= 7.3
+
+composer-update:
+	docker-compose run --rm composer composer config platform.php ${PHP}
+	docker-compose run --rm composer composer update
+	docker-compose run --rm composer composer config --unset platform
+
+test:
+	docker-compose run --rm php-${PHP} php -v
+	docker-compose run --rm php-${PHP} php /app/vendor/bin/phpunit -c /app/phpunit.xml.dist
+test-local:
+	php -v
+	php vendor/bin/phpunit

docker-compose.yaml

@@ -0,0 +1,19 @@
+version: '3'
+
+services:
+
+  composer:
+    image: 'composer:1.6'
+    volumes: ['.:/app']
+
+  # PHP 5.3 contains neither mbstring extension nor docker-php-ext-install script
+  # Original Dockerfile can be found here https://github.com/docker-library/php/pull/20/files
+  # Unfortunately it fails to build now because GPG signatures do not exist anymore
+  # php-5.3: { build: 'docker/php-5.3', volumes: ['.:/app'] }
+  php-5.4: { build: 'docker/php-5.4', volumes: ['.:/app'] }
+  php-5.5: { image: 'php:5.5', volumes: ['.:/app'] }
+  php-5.6: { image: 'php:5.6', volumes: ['.:/app'] }
+  php-7.0: { image: 'php:7.0', volumes: ['.:/app'] }
+  php-7.1: { image: 'php:7.1', volumes: ['.:/app'] }
+  php-7.2: { image: 'php:7.2', volumes: ['.:/app'] }
+  php-7.3: { image: 'php:7.3', volumes: ['.:/app'] }

docker/php-5.4/Dockerfile

@@ -0,0 +1,3 @@
+FROM php:5.4
+
+RUN docker-php-ext-install mbstring

src/Event/ReplaceShortcodesEvent.php

@@ -23,7 +23,6 @@ public function __construct($text, array $replacements, ShortcodeInterface $shor
     {
         $this->shortcode = $shortcode;
         $this->text = $text;
-        $this->result = null;
 
         $this->setReplacements($replacements);
     }

src/EventContainer/EventContainer.php

@@ -16,7 +16,7 @@ public function __construct()
 
     public function addListener($event, $handler)
     {
-        if(!in_array($event, Events::getEvents())) {
+        if(!\in_array($event, Events::getEvents(), true)) {
             throw new \InvalidArgumentException(sprintf('Unsupported event %s!', $event));
         }
 

src/EventHandler/FilterRawEventHandler.php

@@ -25,7 +25,7 @@ public function __construct(array $names)
     public function __invoke(FilterShortcodesEvent $event)
     {
         $parent = $event->getParent();
-        if($parent && in_array($parent->getName(), $this->names)) {
+        if($parent && \in_array($parent->getName(), $this->names, true)) {
             $event->setShortcodes(array());
 
             return;

src/HandlerContainer/HandlerContainer.php

@@ -62,7 +62,7 @@ public function getNames()
 
     public function get($name)
     {
-        return $this->has($name) ? $this->handlers[$name] : ($this->default ?: null);
+        return $this->has($name) ? $this->handlers[$name] : $this->default;
     }
 
     public function has($name)

src/Parser/WordpressParser.php

@@ -97,7 +97,7 @@ private static function parseParameters($text)
                 $parameters[strtolower($match[3])] = stripcslashes($match[4]);
             } elseif(!empty($match[5])) {
                 $parameters[strtolower($match[5])] = stripcslashes($match[6]);
-            } elseif(isset($match[7]) && strlen($match[7])) {
+            } elseif(isset($match[7]) && $match[7] !== '') {
                 $parameters[stripcslashes($match[7])] = null;
             } elseif(isset($match[8])) {
                 $parameters[stripcslashes($match[8])] = null;

src/Processor/Processor.php

@@ -23,7 +23,8 @@ final class Processor implements ProcessorInterface
     /** @var EventContainerInterface */
     private $eventContainer;
 
-    private $recursionDepth = null; // infinite recursion
+    /** @var int|null */
+    private $recursionDepth; // infinite recursion
     private $maxIterations = 1; // one iteration
     private $autoProcessContent = true; // automatically process shortcode content
 
@@ -144,7 +145,7 @@ private function processHandler(ParsedShortcodeInterface $parsed, ProcessorConte
         return mb_substr($state, 0, $offset, 'utf-8').$processed->getContent().mb_substr($state, $offset + $length, mb_strlen($state, 'utf-8'), 'utf-8');
     }
 
-    private function processRecursion(ParsedShortcodeInterface $shortcode, ProcessorContext $context)
+    private function processRecursion(ProcessedShortcode $shortcode, ProcessorContext $context)
     {
         if ($this->autoProcessContent && null !== $shortcode->getContent()) {
             $context->recursionLevel++;