Merge branch 'release/4.1.1'

Author: rhukster

CHANGELOG.md

@@ -1,3 +1,9 @@
+# v4.1.1
+## 04/23/2019
+
+1. [](#improved)
+  * Updated Core Thunderer Shortcode library to `0.7.2`
+
 # v4.1.0
 ## 04/14/2019
 

blueprints.yaml

@@ -1,5 +1,5 @@
 name: Shortcode Core
-version: 4.1.0
+version: 4.1.1
 description: "This plugin provides the core functionality for shortcode plugins"
 icon: code
 author:

composer.lock

@@ -6,6 +6,5 @@
 $baseDir = dirname($vendorDir);
 
 return array(
-    'Thunder\\Shortcode\\Tests\\' => array($vendorDir . '/thunderer/shortcode/tests'),
     'Thunder\\Shortcode\\' => array($vendorDir . '/thunderer/shortcode/src'),
 );

vendor/composer/autoload_psr4.php

@@ -9,16 +9,11 @@ class ComposerStaticInitd0b6ad2d0f2308b1099bc12e8c596f66
     public static $prefixLengthsPsr4 = array (
         'T' => 
         array (
-            'Thunder\\Shortcode\\Tests\\' => 24,
             'Thunder\\Shortcode\\' => 18,
         ),
     );
 
     public static $prefixDirsPsr4 = array (
-        'Thunder\\Shortcode\\Tests\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/thunderer/shortcode/tests',
-        ),
         'Thunder\\Shortcode\\' => 
         array (
             0 => __DIR__ . '/..' . '/thunderer/shortcode/src',

vendor/composer/autoload_static.php

@@ -1,38 +1,37 @@
 [
     {
         "name": "thunderer/shortcode",
-        "version": "v0.7.1",
-        "version_normalized": "0.7.1.0",
+        "version": "v0.7.2",
+        "version_normalized": "0.7.2.0",
         "source": {
             "type": "git",
             "url": "https://github.com/thunderer/Shortcode.git",
-            "reference": "8f3a65f35de7f03e8c4a50e490c490888dc5b722"
+            "reference": "d19ded97c7faf88d93bdfd93c7de358d57be9999"
         },
         "dist": {
             "type": "zip",
-            "url": "https://api.github.com/repos/thunderer/Shortcode/zipball/8f3a65f35de7f03e8c4a50e490c490888dc5b722",
-            "reference": "8f3a65f35de7f03e8c4a50e490c490888dc5b722",
+            "url": "https://api.github.com/repos/thunderer/Shortcode/zipball/d19ded97c7faf88d93bdfd93c7de358d57be9999",
+            "reference": "d19ded97c7faf88d93bdfd93c7de358d57be9999",
             "shasum": ""
         },
         "require": {
             "php": ">=5.3"
         },
         "require-dev": {
-            "phpunit/phpunit": "^4.1|^5.0|^6.0",
-            "symfony/yaml": "^2.0|^3.0"
+            "phpunit/phpunit": ">=4.1",
+            "symfony/yaml": ">=2.0"
         },
         "suggest": {
             "ext-dom": "if you want to use XML serializer",
             "ext-json": "if you want to use JSON serializer",
             "symfony/yaml": "if you want to use YAML serializer"
         },
-        "time": "2019-02-03T22:50:59+00:00",
+        "time": "2019-04-17T18:57:16+00:00",
         "type": "library",
         "installation-source": "dist",
         "autoload": {
             "psr-4": {
-                "Thunder\\Shortcode\\": "src/",
-                "Thunder\\Shortcode\\Tests\\": "tests/"
+                "Thunder\\Shortcode\\": "src/"
             }
         },
         "notification-url": "https://packagist.org/downloads/",

vendor/composer/installed.json

@@ -0,0 +1,4 @@
+rules:
+  # RegularParser::parse() disables xdebug.max_nesting_level to avoid errors when XDebug is enabled
+  php.dynamically_change_configuration:
+    enabled: false

vendor/thunderer/shortcode/.symfony.insight.yaml

@@ -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,4 +26,7 @@ after_script:
 
 matrix:
   allow_failures:
+    - php: 5.3
+    - php: hhvm
     - php: nightly
+    - php: hhvm

vendor/thunderer/shortcode/.travis.yml

@@ -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

vendor/thunderer/shortcode/Makefile

@@ -13,18 +13,22 @@
         "php": ">=5.3"
     },
     "require-dev": {
-        "phpunit/phpunit": "^4.1|^5.0|^6.0",
-        "symfony/yaml": "^2.0|^3.0"
-    },
-    "suggest": {
-        "symfony/yaml": "if you want to use YAML serializer",
-        "ext-dom": "if you want to use XML serializer",
-        "ext-json": "if you want to use JSON serializer"
+        "phpunit/phpunit": ">=4.1",
+        "symfony/yaml": ">=2.0"
     },
     "autoload": {
         "psr-4": {
-            "Thunder\\Shortcode\\": "src/",
+            "Thunder\\Shortcode\\": "src/"
+        }
+    },
+    "autoload-dev": {
+        "psr-4": {
             "Thunder\\Shortcode\\Tests\\": "tests/"
         }
+    },
+    "suggest": {
+        "symfony/yaml": "if you want to use YAML serializer",
+        "ext-dom": "if you want to use XML serializer",
+        "ext-json": "if you want to use JSON serializer"
     }
 }

vendor/thunderer/shortcode/composer.json

@@ -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'] }

vendor/thunderer/shortcode/docker-compose.yaml

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

vendor/thunderer/shortcode/docker/php-5.4/Dockerfile

@@ -8,7 +8,6 @@
     convertWarningsToExceptions = "true"
     processIsolation = "false"
     stopOnFailure = "false"
-    syntaxCheck = "false"
     bootstrap = "vendor/autoload.php"
     >
 
@@ -19,8 +18,7 @@
     </testsuites>
 
     <logging>
-        <log type="coverage-html" target="coverage" charset="UTF-8"
-             yui="true" highlight="false" lowUpperBound="50" highLowerBound="90"/>
+        <log type="coverage-html" target="coverage" lowUpperBound="50" highLowerBound="90"/>
         <log type="coverage-clover" target="coverage.xml"/>
     </logging>
 

vendor/thunderer/shortcode/phpunit.xml.dist

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

vendor/thunderer/shortcode/src/Event/ReplaceShortcodesEvent.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));
         }
 

vendor/thunderer/shortcode/src/EventContainer/EventContainer.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;

vendor/thunderer/shortcode/src/EventHandler/FilterRawEventHandler.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)

vendor/thunderer/shortcode/src/HandlerContainer/HandlerContainer.php

@@ -57,6 +57,11 @@ public function parse($text)
             $names = array();
             $this->beginBacktrack();
             $matches = $this->shortcode($names);
+            if(false === $matches) {
+                $this->backtrack();
+                $this->match(null, true);
+                continue;
+            }
             if(\is_array($matches)) {
                 foreach($matches as $shortcode) {
                     $shortcodes[] = $shortcode;
@@ -151,11 +156,13 @@ private function shortcode(array &$names)
         if(false === $content || $closingName !== $name) {
             $this->backtrack(false);
             $text = $this->backtrack(false);
+            array_pop($names);
 
             return array_merge(array($this->getObject($name, $parameters, $bbCode, $offset, null, $text)), $shortcodes);
         }
         $content = $this->getBacktrack();
         if(!$this->close($names)) { return false; }
+        array_pop($names);
 
         return array($this->getObject($name, $parameters, $bbCode, $offset, $content, $this->getBacktrack()));
     }

vendor/thunderer/shortcode/src/Parser/RegularParser.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;

vendor/thunderer/shortcode/src/Parser/WordpressParser.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++;

vendor/thunderer/shortcode/src/Processor/Processor.php

@@ -9,21 +9,21 @@
 final class ProcessorContext
 {
     /** @var ShortcodeInterface */
-    public $shortcode = null;
+    public $shortcode;
 
     /** @var ShortcodeInterface */
-    public $parent = null;
+    public $parent;
 
     /** @var ProcessorInterface */
-    public $processor = null;
+    public $processor;
 
-    public $textContent = null;
+    public $textContent;
     public $position = 0;
     public $namePosition = array();
     public $text = '';
     public $shortcodeText = '';
     public $iterationNumber = 0;
     public $recursionLevel = 0;
-    public $offset = null;
-    public $baseOffset = null;
+    public $offset;
+    public $baseOffset;
 }

vendor/thunderer/shortcode/src/Processor/ProcessorContext.php

@@ -56,7 +56,7 @@ private function serializeValue($value)
         $delimiter = $this->syntax->getParameterValueDelimiter();
         $separator = $this->syntax->getParameterValueSeparator();
 
-        return $separator.(preg_match('/^\w+$/us', $value)
+        return $separator.(preg_match('/^\w+$/u', $value)
             ? $value
             : $delimiter.$value.$delimiter);
     }

vendor/thunderer/shortcode/src/Serializer/TextSerializer.php

@@ -8,11 +8,11 @@ final class Shortcode extends AbstractShortcode implements ShortcodeInterface
 {
     public function __construct($name, array $parameters, $content, $bbCode = null)
     {
-        if(false === is_string($name) || (is_string($name) && !mb_strlen($name))) {
+        if(false === is_string($name) || '' === $name) {
             throw new \InvalidArgumentException('Shortcode name must be a non-empty string!');
         }
 
-        $isStringOrNull = function($value) { return is_string($value) || is_null($value); };
+        $isStringOrNull = function($value) { return is_string($value) || null === $value; };
         if(count(array_filter($parameters, $isStringOrNull)) !== count($parameters)) {
             throw new \InvalidArgumentException('Parameter values must be either string or empty (null)!');
         }