Changeset 3279405

Timestamp:

04/22/2025 07:55:36 PM (8 months ago)

Author:

NodleRedoy

Message:

Update trunk to 2.6.61

Location:

simple-post-template/trunk

Files:

• composer.lock (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• simple-content-template.php (modified) (3 diffs)
• vendor/autoload.php (modified) (1 diff)
• vendor/composer/InstalledVersions.php (modified) (5 diffs)
• vendor/composer/installed.php (modified) (2 diffs)

simple-post-template/trunk/composer.lock

@@ -93 +93 @@
     "aliases": [],
     "minimum-stability": "stable",
-    "stability-flags": [],
+    "stability-flags": {},
     "prefer-stable": false,
     "prefer-lowest": false,
-    "platform": [],
-    "platform-dev": [],
+    "platform": {},
+    "platform-dev": {},
     "plugin-api-version": "2.6.0"
 }

simple-post-template/trunk/readme.txt

@@ -3 +3 @@
 Tags: post template, content template, post from template, templates, copy, clone, duplicate
 Requires at least: 3.6
-Tested up to: 6.7
+Tested up to: 6.8
 Stable tag: 2.2.6
 
@@ -37 +37 @@
 == Changelog ==
 
+**Version 2.2.61**
+
+* Bump version
+* Update dependencies
+
 **Version 2.2.6**
 

simple-post-template/trunk/simple-content-template.php

@@ -17 +17 @@
  * Plugin URI:        https://www.advancedcontenttemplates.com/
  * Description:       A simple to use content template system. Create similarly structured posts & pages with ease.
- * Version:           2.2.6
+ * Version:           2.2.61
  * Author:            Clifton Griffin
  * Author URI:        https://objectiv.co
@@ -24 +24 @@
  * Text Domain:       advanced-content-templates
  * Domain Path:       /languages
- * Tested up to:      6.7
+ * Tested up to:      6.8
  */
 
@@ -32 +32 @@
 }
 
-define('CGD_SCT_VERSION', '2.2.6');
+define('CGD_SCT_VERSION', '2.2.61');
 define('CGD_SCT_NAME', 'Simple Content Templates');
 

simple-post-template/trunk/vendor/autoload.php

@@ -15 +15 @@
         }
     }
-    trigger_error(
-        $err,
-        E_USER_ERROR
-    );
+    throw new RuntimeException($err);
 }
 

simple-post-template/trunk/vendor/composer/InstalledVersions.php

@@ -28 +28 @@
 {
     /**
+     * @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;
 
     /**
@@ -310 +321 @@
         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;
     }
 
@@ -323 +352 @@
 
         $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];
@@ -331 +363 @@
                     /** @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;
                 }
             }
@@ -351 +388 @@
         }
 
-        if (self::$installed !== array()) {
+        if (self::$installed !== array() && !$copiedLocalDir) {
             $installed[] = self::$installed;
         }

simple-post-template/trunk/vendor/composer/installed.php

@@ -2 +2 @@
     'root' => array(
         'name' => '__root__',
-        'pretty_version' => 'dev-develop',
-        'version' => 'dev-develop',
-        'reference' => '85ba9c34f8fa708b74711554beed6720c1f10534',
+        'pretty_version' => 'dev-master',
+        'version' => 'dev-master',
+        'reference' => '0e563f6f3ef30738836d5debf315112a080163fc',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
@@ -12 +12 @@
     'versions' => array(
         '__root__' => array(
-            'pretty_version' => 'dev-develop',
-            'version' => 'dev-develop',
-            'reference' => '85ba9c34f8fa708b74711554beed6720c1f10534',
+            'pretty_version' => 'dev-master',
+            'version' => 'dev-master',
+            'reference' => '0e563f6f3ef30738836d5debf315112a080163fc',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',