:tag: v5.1.0

Author: bnomei

composer.json

@@ -1,7 +1,7 @@
 {
   "name": "bnomei/kirby3-feed",
   "type": "kirby-plugin",
-  "version": "5.0.2",
+  "version": "5.1.0",
   "description": "Generate a Atom/JSON/RSS-Feed and XML-Sitemap from Pages-Collections",
   "license": "MIT",
   "authors": [

composer.lock

@@ -16,7 +16,7 @@
       <pubDate><?= $datefield === 'modified' ? $item->modified('r', 'date') : date('r', $item->{$datefield}()->toTimestamp()) ?></pubDate>
       <description><![CDATA[<?= $item->{$textfield}()->kirbytext() ?>]]></description>
       <?php $image = $images && $imagesfield ? $item->{$imagesfield}()->toFiles()->first() : null;
-        if ($image): ?><enclosure url="<?= $image->url() ?>" length="<?= $image->size() ?>" type="<?= $image->mime() ?>" /><?php endif ?>
+        if ($image) { ?><enclosure url="<?= $image->url() ?>" length="<?= $image->size() ?>" type="<?= $image->mime() ?>" /><?php } ?>
     </item>
     <?php } ?>
   </channel>

snippets/feed/rss.php

@@ -14,12 +14,9 @@
             echo $err;
         }
     }
-    trigger_error(
-        $err,
-        E_USER_ERROR
-    );
+    throw new RuntimeException($err);
 }
 
 require_once __DIR__ . '/composer/autoload_real.php';
 
-return ComposerAutoloaderInitaf8d17a1f56ab45ff392381ed969a9c4::getLoader();
+return ComposerAutoloaderInit42deffd5af668dd8c39d08d6f8c605e4::getLoader();

vendor/autoload.php

@@ -26,12 +26,23 @@
  */
 class InstalledVersions
 {
+    /**
+     * @var string|null if set (by reflection by Composer), this should be set to the path where this class is being copied to
+     * @internal
+     */
+    private static $selfDir = null;
+
     /**
      * @var mixed[]|null
      * @psalm-var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>}|array{}|null
      */
     private static $installed;
 
+    /**
+     * @var bool
+     */
+    private static $installedIsLocalDir;
+
     /**
      * @var bool|null
      */
@@ -309,6 +320,24 @@ public static function reload($data)
     {
         self::$installed = $data;
         self::$installedByVendor = array();
+
+        // when using reload, we disable the duplicate protection to ensure that self::$installed data is
+        // always returned, but we cannot know whether it comes from the installed.php in __DIR__ or not,
+        // so we have to assume it does not, and that may result in duplicate data being returned when listing
+        // all installed packages for example
+        self::$installedIsLocalDir = false;
+    }
+
+    /**
+     * @return string
+     */
+    private static function getSelfDir()
+    {
+        if (self::$selfDir === null) {
+            self::$selfDir = strtr(__DIR__, '\\', '/');
+        }
+
+        return self::$selfDir;
     }
 
     /**
@@ -322,19 +351,27 @@ private static function getInstalled()
         }
 
         $installed = array();
+        $copiedLocalDir = false;
 
         if (self::$canGetVendors) {
+            $selfDir = self::getSelfDir();
             foreach (ClassLoader::getRegisteredLoaders() as $vendorDir => $loader) {
+                $vendorDir = strtr($vendorDir, '\\', '/');
                 if (isset(self::$installedByVendor[$vendorDir])) {
                     $installed[] = self::$installedByVendor[$vendorDir];
                 } elseif (is_file($vendorDir.'/composer/installed.php')) {
                     /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array<string, array{pretty_version?: string, version?: string, reference?: string|null, type?: string, install_path?: string, aliases?: string[], dev_requirement: bool, replaced?: string[], provided?: string[]}>} $required */
                     $required = require $vendorDir.'/composer/installed.php';
-                    $installed[] = self::$installedByVendor[$vendorDir] = $required;
-                    if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) {
-                        self::$installed = $installed[count($installed) - 1];
+                    self::$installedByVendor[$vendorDir] = $required;
+                    $installed[] = $required;
+                    if (self::$installed === null && $vendorDir.'/composer' === $selfDir) {
+                        self::$installed = $required;
+                        self::$installedIsLocalDir = true;
                     }
                 }
+                if (self::$installedIsLocalDir && $vendorDir.'/composer' === $selfDir) {
+                    $copiedLocalDir = true;
+                }
             }
         }
 
@@ -350,7 +387,7 @@ private static function getInstalled()
             }
         }
 
-        if (self::$installed !== array()) {
+        if (self::$installed !== array() && !$copiedLocalDir) {
             $installed[] = self::$installed;
         }
 

vendor/composer/InstalledVersions.php

@@ -2,7 +2,7 @@
 
 // autoload_real.php @generated by Composer
 
-class ComposerAutoloaderInitaf8d17a1f56ab45ff392381ed969a9c4
+class ComposerAutoloaderInit42deffd5af668dd8c39d08d6f8c605e4
 {
     private static $loader;
 
@@ -24,12 +24,12 @@ public static function getLoader()
 
         require __DIR__ . '/platform_check.php';
 
-        spl_autoload_register(array('ComposerAutoloaderInitaf8d17a1f56ab45ff392381ed969a9c4', 'loadClassLoader'), true, true);
+        spl_autoload_register(array('ComposerAutoloaderInit42deffd5af668dd8c39d08d6f8c605e4', 'loadClassLoader'), true, true);
         self::$loader = $loader = new \Composer\Autoload\ClassLoader(\dirname(__DIR__));
-        spl_autoload_unregister(array('ComposerAutoloaderInitaf8d17a1f56ab45ff392381ed969a9c4', 'loadClassLoader'));
+        spl_autoload_unregister(array('ComposerAutoloaderInit42deffd5af668dd8c39d08d6f8c605e4', 'loadClassLoader'));
 
         require __DIR__ . '/autoload_static.php';
-        call_user_func(\Composer\Autoload\ComposerStaticInitaf8d17a1f56ab45ff392381ed969a9c4::getInitializer($loader));
+        call_user_func(\Composer\Autoload\ComposerStaticInit42deffd5af668dd8c39d08d6f8c605e4::getInitializer($loader));
 
         $loader->register(true);
 

vendor/composer/autoload_real.php

@@ -4,7 +4,7 @@
 
 namespace Composer\Autoload;
 
-class ComposerStaticInitaf8d17a1f56ab45ff392381ed969a9c4
+class ComposerStaticInit42deffd5af668dd8c39d08d6f8c605e4
 {
     public static $prefixLengthsPsr4 = array (
         'K' => 
@@ -40,9 +40,9 @@ class ComposerStaticInitaf8d17a1f56ab45ff392381ed969a9c4
     public static function getInitializer(ClassLoader $loader)
     {
         return \Closure::bind(function () use ($loader) {
-            $loader->prefixLengthsPsr4 = ComposerStaticInitaf8d17a1f56ab45ff392381ed969a9c4::$prefixLengthsPsr4;
-            $loader->prefixDirsPsr4 = ComposerStaticInitaf8d17a1f56ab45ff392381ed969a9c4::$prefixDirsPsr4;
-            $loader->classMap = ComposerStaticInitaf8d17a1f56ab45ff392381ed969a9c4::$classMap;
+            $loader->prefixLengthsPsr4 = ComposerStaticInit42deffd5af668dd8c39d08d6f8c605e4::$prefixLengthsPsr4;
+            $loader->prefixDirsPsr4 = ComposerStaticInit42deffd5af668dd8c39d08d6f8c605e4::$prefixDirsPsr4;
+            $loader->classMap = ComposerStaticInit42deffd5af668dd8c39d08d6f8c605e4::$classMap;
 
         }, null, ClassLoader::class);
     }

vendor/composer/autoload_static.php

@@ -1,8 +1,8 @@
 <?php return array(
     'root' => array(
         'name' => 'bnomei/kirby3-feed',
-        'pretty_version' => '5.0.2',
-        'version' => '5.0.2.0',
+        'pretty_version' => '5.1.0',
+        'version' => '5.1.0.0',
         'reference' => null,
         'type' => 'kirby-plugin',
         'install_path' => __DIR__ . '/../../',
@@ -11,8 +11,8 @@
     ),
     'versions' => array(
         'bnomei/kirby3-feed' => array(
-            'pretty_version' => '5.0.2',
-            'version' => '5.0.2.0',
+            'pretty_version' => '5.1.0',
+            'version' => '5.1.0.0',
             'reference' => null,
             'type' => 'kirby-plugin',
             'install_path' => __DIR__ . '/../../',

vendor/composer/installed.php

@@ -19,8 +19,7 @@
             echo 'Composer detected issues in your platform:' . PHP_EOL.PHP_EOL . str_replace('You are running '.PHP_VERSION.'.', '', implode(PHP_EOL, $issues)) . PHP_EOL.PHP_EOL;
         }
     }
-    trigger_error(
-        'Composer detected issues in your platform: ' . implode(' ', $issues),
-        E_USER_ERROR
+    throw new \RuntimeException(
+        'Composer detected issues in your platform: ' . implode(' ', $issues)
     );
 }