Merge branch 'release/5.1.2'

getgrav · May 10, 2022 · 6c6a8d9 · 6c6a8d9
2 parents 2bc93e3 + eb7538f
commit 6c6a8d9
Show file tree

Hide file tree

Showing 63 changed files with 868 additions and 224 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v5.1.2
+## 05/10/2022
+
+1. [](#bugfix)
+    * Upgraded `thunderer/shortcode` to 0.7.5 to address a security issue
+
 # v5.1.1
 ## 01/11/2022
 

diff --git a/blueprints.yaml b/blueprints.yaml
@@ -1,7 +1,7 @@
 name: Shortcode Core
 slug: shortcode-core
 type: plugin
-version: 5.1.1
+version: 5.1.2
 description: "This plugin provides the core functionality for shortcode plugins"
 icon: code
 author:

diff --git a/composer.lock b/composer.lock
diff --git a/vendor/autoload.php b/vendor/autoload.php
@@ -2,6 +2,11 @@
 
 // autoload.php @generated by Composer
 
+if (PHP_VERSION_ID < 50600) {
+    echo 'Composer 2.3.0 dropped support for autoloading on PHP <5.6 and you are running '.PHP_VERSION.', please upgrade PHP or use Composer 2.2 LTS via "composer self-update --2.2". Aborting.'.PHP_EOL;
+    exit(1);
+}
+
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitd0b6ad2d0f2308b1099bc12e8c596f66::getLoader();
+return ComposerAutoloaderInit20dff4ef15e2090e54c04a9aa83321b9::getLoader();
diff --git a/vendor/composer/ClassLoader.php b/vendor/composer/ClassLoader.php
@@ -149,7 +149,7 @@ public function getFallbackDirsPsr4()
 
     /**
      * @return string[] Array of classname => path
-     * @psalm-var array<string, string>
+     * @psalm-return array<string, string>
      */
     public function getClassMap()
     {

diff --git a/vendor/composer/InstalledVersions.php b/vendor/composer/InstalledVersions.php
@@ -21,6 +21,8 @@
  * See also https://getcomposer.org/doc/07-runtime.md#installed-versions
  *
  * To require its presence, you can require `composer-runtime-api ^2.0`
+ *
+ * @final
  */
 class InstalledVersions
 {

diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
@@ -2,7 +2,7 @@
 
 // autoload_classmap.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(

diff --git a/vendor/composer/autoload_namespaces.php b/vendor/composer/autoload_namespaces.php
@@ -2,7 +2,7 @@
 
 // autoload_namespaces.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(

diff --git a/vendor/composer/autoload_psr4.php b/vendor/composer/autoload_psr4.php
@@ -2,7 +2,7 @@
 
 // autoload_psr4.php @generated by Composer
 
-$vendorDir = dirname(dirname(__FILE__));
+$vendorDir = dirname(__DIR__);
 $baseDir = dirname($vendorDir);
 
 return array(

diff --git a/vendor/composer/autoload_real.php b/vendor/composer/autoload_real.php
@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitd0b6ad2d0f2308b1099bc12e8c596f66
+class ComposerAutoloaderInit20dff4ef15e2090e54c04a9aa83321b9
 {
     private static $loader;
 
@@ -24,31 +24,12 @@ public static function getLoader()
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInitd0b6ad2d0f2308b1099bc12e8c596f66', 'loadClassLoader'), true, true);
-        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(\dirname(__FILE__)));
-        spl_autoload_unregister(array('ComposerAutoloaderInitd0b6ad2d0f2308b1099bc12e8c596f66', 'loadClassLoader'));
-
-        $useStaticLoader = PHP_VERSION_ID >= 50600 && !defined('HHVM_VERSION') && (!function_exists('zend_loader_file_encoded') || !zend_loader_file_encoded());
-        if ($useStaticLoader) {
-            require __DIR__ . '/autoload_static.php';
-
-            call_user_func(\Composer\Autoload\ComposerStaticInitd0b6ad2d0f2308b1099bc12e8c596f66::getInitializer($loader));
-        } else {
-            $map = require __DIR__ . '/autoload_namespaces.php';
-            foreach ($map as $namespace => $path) {
-                $loader->set($namespace, $path);
-            }
-
-            $map = require __DIR__ . '/autoload_psr4.php';
-            foreach ($map as $namespace => $path) {
-                $loader->setPsr4($namespace, $path);
-            }
-
-            $classMap = require __DIR__ . '/autoload_classmap.php';
-            if ($classMap) {
-                $loader->addClassMap($classMap);
-            }
-        }
+        spl_autoload_register(array('ComposerAutoloaderInit20dff4ef15e2090e54c04a9aa83321b9', 'loadClassLoader'), true, true);
+        self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
+        spl_autoload_unregister(array('ComposerAutoloaderInit20dff4ef15e2090e54c04a9aa83321b9', 'loadClassLoader'));
+
+        require __DIR__ . '/autoload_static.php';
+        call_user_func(\Composer\Autoload\ComposerStaticInit20dff4ef15e2090e54c04a9aa83321b9::getInitializer($loader));
 
         $loader->register(true);
 

diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitd0b6ad2d0f2308b1099bc12e8c596f66
+class ComposerStaticInit20dff4ef15e2090e54c04a9aa83321b9
 {
     public static $prefixLengthsPsr4 = array (
         'T' => 
@@ -41,9 +41,9 @@ class ComposerStaticInitd0b6ad2d0f2308b1099bc12e8c596f66
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitd0b6ad2d0f2308b1099bc12e8c596f66::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitd0b6ad2d0f2308b1099bc12e8c596f66::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitd0b6ad2d0f2308b1099bc12e8c596f66::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit20dff4ef15e2090e54c04a9aa83321b9::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit20dff4ef15e2090e54c04a9aa83321b9::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit20dff4ef15e2090e54c04a9aa83321b9::$classMap;
 
         }, null, ClassLoader::class);
     }

diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
@@ -2,17 +2,17 @@
     "packages": [
         {
             "name": "thunderer/shortcode",
-            "version": "v0.7.4",
-            "version_normalized": "0.7.4.0",
+            "version": "v0.7.5",
+            "version_normalized": "0.7.5.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thunderer/Shortcode.git",
-                "reference": "79a219febd774ba1ee66a2992fee1145b4367561"
+                "reference": "a4fee30613bd46efb421f8305aff0466a3268a99"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thunderer/Shortcode/zipball/79a219febd774ba1ee66a2992fee1145b4367561",
-                "reference": "79a219febd774ba1ee66a2992fee1145b4367561",
+                "url": "https://api.github.com/repos/thunderer/Shortcode/zipball/a4fee30613bd46efb421f8305aff0466a3268a99",
+                "reference": "a4fee30613bd46efb421f8305aff0466a3268a99",
                 "shasum": ""
             },
             "require": {
@@ -27,7 +27,7 @@
                 "ext-json": "if you want to use JSON serializer",
                 "symfony/yaml": "if you want to use YAML serializer"
             },
-            "time": "2020-03-08T11:25:13+00:00",
+            "time": "2022-01-13T18:53:33+00:00",
             "type": "library",
             "installation-source": "dist",
             "autoload": {
@@ -55,11 +55,11 @@
             ],
             "support": {
                 "issues": "https://github.com/thunderer/Shortcode/issues",
-                "source": "https://github.com/thunderer/Shortcode/tree/v0.7.4"
+                "source": "https://github.com/thunderer/Shortcode/tree/v0.7.5"
             },
             "install-path": "../thunderer/shortcode"
         }
     ],
-    "dev": true,
+    "dev": false,
     "dev-package-names": []
 }
diff --git a/vendor/composer/installed.php b/vendor/composer/installed.php
@@ -5,9 +5,9 @@
         'type' => 'grav-plugin',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
-        'reference' => '743c68a7a91d0805911497042bbecd9b1d75611d',
+        'reference' => 'd351265e0de9dfd18dcc842977d80b97c9524e81',
         'name' => 'getgrav/shortcode-core',
-        'dev' => true,
+        'dev' => false,
     ),
     'versions' => array(
         'getgrav/shortcode-core' => array(
@@ -16,16 +16,16 @@
             'type' => 'grav-plugin',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),
-            'reference' => '743c68a7a91d0805911497042bbecd9b1d75611d',
+            'reference' => 'd351265e0de9dfd18dcc842977d80b97c9524e81',
             'dev_requirement' => false,
         ),
         'thunderer/shortcode' => array(
-            'pretty_version' => 'v0.7.4',
-            'version' => '0.7.4.0',
+            'pretty_version' => 'v0.7.5',
+            'version' => '0.7.5.0',
             'type' => 'library',
             'install_path' => __DIR__ . '/../thunderer/shortcode',
             'aliases' => array(),
-            'reference' => '79a219febd774ba1ee66a2992fee1145b4367561',
+            'reference' => 'a4fee30613bd46efb421f8305aff0466a3268a99',
             'dev_requirement' => false,
         ),
     ),

diff --git a/vendor/thunderer/shortcode/.github/workflows/test.yaml b/vendor/thunderer/shortcode/.github/workflows/test.yaml
@@ -0,0 +1,47 @@
+name: Test
+
+on:
+  push:
+    branches: ['master']
+  pull_request: ~
+
+jobs:
+  test:
+    runs-on: '${{ matrix.os }}'
+    strategy:
+      matrix:
+        php: ['5.3', '5.4', '5.5', '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1']
+        os: ['ubuntu-latest']
+        failure: [false]
+        include:
+          - { php: '8.2', os: 'ubuntu-latest', failure: true } # '8.2' means 'nightly'
+    steps:
+      - name: 'Checkout'
+        uses: 'actions/checkout@v2'
+      - name: 'Install PHP'
+        uses: 'shivammathur/setup-php@v2'
+        with:
+          php-version: '${{ matrix.php }}'
+          tools: 'composer:v2'
+          coverage: 'xdebug'
+      - name: 'PHP'
+        run: 'php -v'
+
+      - name: 'Composer'
+        run: 'composer install'
+        continue-on-error: '${{ matrix.failure }}'
+      - name: 'PHPUnit'
+        run: 'php vendor/bin/phpunit --coverage-text'
+        continue-on-error: '${{ matrix.failure }}'
+      - name: 'Psalm'
+        run: |
+          composer require --dev vimeo/psalm
+          php vendor/bin/psalm --shepherd --php-version=${{ matrix.php }}
+        if: '${{ matrix.php >= 7.1 }}'
+        continue-on-error: '${{ matrix.failure }}'
+      - name: 'Infection'
+        run: |
+          composer require --dev --with-all-dependencies infection/infection
+          php vendor/bin/infection
+        if: '${{ matrix.php >= 7.1 }}'
+        continue-on-error: '${{ matrix.failure }}'
diff --git a/vendor/thunderer/shortcode/.gitignore b/vendor/thunderer/shortcode/.gitignore
@@ -1,3 +1,5 @@
+.phpunit.result.cache
+infection.log
 vendor
 composer.lock
 coverage

diff --git a/vendor/thunderer/shortcode/.symfony.insight.yaml b/vendor/thunderer/shortcode/.symfony.insight.yaml
diff --git a/vendor/thunderer/shortcode/.travis.yml b/vendor/thunderer/shortcode/.travis.yml
diff --git a/vendor/thunderer/shortcode/LICENSE b/vendor/thunderer/shortcode/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2015-2016 Tomasz Kowalczyk
+Copyright (c) 2015-2022 Tomasz Kowalczyk
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal