Changeset 2786914

Timestamp:

09/19/2022 11:39:41 AM (3 years ago)

Author:

pmpr

Message:

fix a bug

Location:

pmpr-ir

Files:

• tags/1.2.1/src/Pmpr/Plugin/Pmpr/Ajax.php (modified) (1 diff)
• tags/1.2.1/src/Pmpr/Plugin/Pmpr/Component/Item.php (modified) (7 diffs)
• trunk/src/Pmpr/Plugin/Pmpr/Ajax.php (modified) (1 diff)
• trunk/src/Pmpr/Plugin/Pmpr/Component/Item.php (modified) (7 diffs)

pmpr-ir/tags/1.2.1/src/Pmpr/Plugin/Pmpr/Ajax.php

@@ -178 +178 @@
                         case 'update':
 
+                            $this->fetchCommonComponents(true);
                             $fetched = API::getInstance()->getComponent($name);
                             if ($fetched && !is_wp_error($fetched)

pmpr-ir/tags/1.2.1/src/Pmpr/Plugin/Pmpr/Component/Item.php

@@ -3 +3 @@
 namespace Pmpr\Plugin\Pmpr\Component;
 
+use Exception;
 use Pmpr\Plugin\Pmpr\Interfaces\ConstantInterface;
 use Pmpr\Plugin\Pmpr\Manipulate;
@@ -19 +20 @@
 
     /**
+     * @var array|object
+     */
+    protected $composer = [];
+
+    /**
      * @var int|string|null
      */
@@ -126 +132 @@
                 }
             }
+
+            $composerPath = trailingslashit(Manipulate::getComponentsRootPath($this->getTypeSlug())) . trailingslashit($this->getName()) . 'composer.json';
+            if (file_exists($composerPath)) {
+
+                $fields = wp_json_file_decode($composerPath);
+                if (is_array($fields) || is_object($fields)) {
+
+                    $this->composer = (array)$fields;
+                }
+            }
         }
     }
@@ -132 +148 @@
      * @return array|object
      */
+    public function getComposer()
+    {
+        return $this->composer;
+    }
+
+    /**
+     * @param $key
+     * @param $default
+     *
+     * @return mixed
+     */
+    public function getComposerField($key, $default = null)
+    {
+        return Manipulate::getArrayItem($this->getComposer(), $key, $default);
+    }
+
+    /**
+     * @return array|object
+     */
     public function getData()
     {
@@ -166 +201 @@
     public function getVersion(): ?string
     {
-        return $this->version;
+        return $this->getComposerField(self::VERSION, $this->version);
     }
 
@@ -242 +277 @@
 
     /**
-     * @return string|null
-     */
-    public function getSlug(): ?string
+     * @return string
+     */
+    public function getTypeSlug(): string
     {
         $type = '';
@@ -261 +296 @@
                 break;
         }
-
+        return $type;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getSlug(): ?string
+    {
+        $type = $this->getTypeSlug();
         $name = str_replace("wp-{$type}-", '', $this->getName());
         return "pr__{$type}__" . str_replace('-', '_', $name);

pmpr-ir/trunk/src/Pmpr/Plugin/Pmpr/Ajax.php

@@ -178 +178 @@
                         case 'update':
 
+                            $this->fetchCommonComponents(true);
                             $fetched = API::getInstance()->getComponent($name);
                             if ($fetched && !is_wp_error($fetched)

pmpr-ir/trunk/src/Pmpr/Plugin/Pmpr/Component/Item.php

@@ -3 +3 @@
 namespace Pmpr\Plugin\Pmpr\Component;
 
+use Exception;
 use Pmpr\Plugin\Pmpr\Interfaces\ConstantInterface;
 use Pmpr\Plugin\Pmpr\Manipulate;
@@ -19 +20 @@
 
     /**
+     * @var array|object
+     */
+    protected $composer = [];
+
+    /**
      * @var int|string|null
      */
@@ -126 +132 @@
                 }
             }
+
+            $composerPath = trailingslashit(Manipulate::getComponentsRootPath($this->getTypeSlug())) . trailingslashit($this->getName()) . 'composer.json';
+            if (file_exists($composerPath)) {
+
+                $fields = wp_json_file_decode($composerPath);
+                if (is_array($fields) || is_object($fields)) {
+
+                    $this->composer = (array)$fields;
+                }
+            }
         }
     }
@@ -132 +148 @@
      * @return array|object
      */
+    public function getComposer()
+    {
+        return $this->composer;
+    }
+
+    /**
+     * @param $key
+     * @param $default
+     *
+     * @return mixed
+     */
+    public function getComposerField($key, $default = null)
+    {
+        return Manipulate::getArrayItem($this->getComposer(), $key, $default);
+    }
+
+    /**
+     * @return array|object
+     */
     public function getData()
     {
@@ -166 +201 @@
     public function getVersion(): ?string
     {
-        return $this->version;
+        return $this->getComposerField(self::VERSION, $this->version);
     }
 
@@ -242 +277 @@
 
     /**
-     * @return string|null
-     */
-    public function getSlug(): ?string
+     * @return string
+     */
+    public function getTypeSlug(): string
     {
         $type = '';
@@ -261 +296 @@
                 break;
         }
-
+        return $type;
+    }
+
+    /**
+     * @return string|null
+     */
+    public function getSlug(): ?string
+    {
+        $type = $this->getTypeSlug();
         $name = str_replace("wp-{$type}-", '', $this->getName());
         return "pr__{$type}__" . str_replace('-', '_', $name);