Changeset 2784464

Timestamp:

09/14/2022 08:40:59 AM (3 years ago)

Author:

pmpr

Message:

update codebase

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/Traits/CommonTrait.php (modified) (4 diffs)
• trunk/src/Pmpr/Plugin/Pmpr/Ajax.php (modified) (1 diff)
• trunk/src/Pmpr/Plugin/Pmpr/Traits/CommonTrait.php (modified) (4 diffs)

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

@@ -70 +70 @@
 
                             // try to get last updates before install
-                            $this->fetchCommonComponents(true);
-                            if ($components = $this->getCommonComponents()) {
+                            if ($components = $this->fetchCommonComponents(true)) {
 
                                 $code = null;

pmpr-ir/tags/1.2.1/src/Pmpr/Plugin/Pmpr/Traits/CommonTrait.php

@@ -118 +118 @@
         foreach ($requirements as $requirement) {
 
-            if (Manipulate::getArrayItem($requirement, 'show', false)) {
+            if (Manipulate::getArrayItem($requirement, 'show')) {
 
                 $satisfied = false;
@@ -139 +139 @@
     public function getCommonComponents(): array
     {
-        $result = [];
-        if ($commons = get_transient(self::FETCHED_COMMONS)) {
+        $result  = [];
+        $commons = get_transient(self::FETCHED_COMMONS);
+
+        if (!$commons) {
+
+            $commons = $this->fetchCommonComponents(true);
+        }
+
+        if ($commons && is_array($commons)) {
 
             foreach ($commons as $common) {
@@ -164 +171 @@
     public function fetchCommonComponents(bool $force = false)
     {
-        if ($this->isRequirementsSatisfied(true)) {
-
-            if ($force || !get_transient(self::FETCHED_COMMONS)) {
+        $items = [];
+        if ($this->isRequirementsSatisfied()) {
+
+            $items = get_transient(self::FETCHED_COMMONS);
+            if ($force || !$items) {
 
                 if (!get_transient(self::FETCH_COMMON_COMPONENTS_RUNNING)) {
@@ -187 +196 @@
             }
         }
+
+        return $items;
     }
 

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

@@ -70 +70 @@
 
                             // try to get last updates before install
-                            $this->fetchCommonComponents(true);
-                            if ($components = $this->getCommonComponents()) {
+                            if ($components = $this->fetchCommonComponents(true)) {
 
                                 $code = null;

pmpr-ir/trunk/src/Pmpr/Plugin/Pmpr/Traits/CommonTrait.php

@@ -118 +118 @@
         foreach ($requirements as $requirement) {
 
-            if (Manipulate::getArrayItem($requirement, 'show', false)) {
+            if (Manipulate::getArrayItem($requirement, 'show')) {
 
                 $satisfied = false;
@@ -139 +139 @@
     public function getCommonComponents(): array
     {
-        $result = [];
-        if ($commons = get_transient(self::FETCHED_COMMONS)) {
+        $result  = [];
+        $commons = get_transient(self::FETCHED_COMMONS);
+
+        if (!$commons) {
+
+            $commons = $this->fetchCommonComponents(true);
+        }
+
+        if ($commons && is_array($commons)) {
 
             foreach ($commons as $common) {
@@ -164 +171 @@
     public function fetchCommonComponents(bool $force = false)
     {
-        if ($this->isRequirementsSatisfied(true)) {
-
-            if ($force || !get_transient(self::FETCHED_COMMONS)) {
+        $items = [];
+        if ($this->isRequirementsSatisfied()) {
+
+            $items = get_transient(self::FETCHED_COMMONS);
+            if ($force || !$items) {
 
                 if (!get_transient(self::FETCH_COMMON_COMPONENTS_RUNNING)) {
@@ -187 +196 @@
             }
         }
+
+        return $items;
     }