Fix notice in Wireframe::page() when Page object is not wired

wireframe-framework · Aug 31, 2022 · f0102b5 · f0102b5
1 parent 30b57eb
commit f0102b5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.26.2] - 2022-08-31
+
+### Fixed
+- Fixed an issue where Wireframe::page() wasn't handling "non-wired" Page objects properly, resulting in a notice.
+
 ## [0.26.1] - 2022-07-11
 
 ### Changed

diff --git a/Wireframe.info.json b/Wireframe.info.json
@@ -1,7 +1,7 @@
 {
     "title": "Wireframe",
     "summary": "Wireframe is an output framework for ProcessWire CMS/CMF.",
-    "version": "0.26.1",
+    "version": "0.26.2",
     "author": "Teppo Koivula",
     "href": "https://wireframe-framework.com",
     "requires": [

diff --git a/Wireframe.module.php b/Wireframe.module.php
@@ -14,7 +14,7 @@
  * @method static string|Page|NullPage page($source, $args = []) Static getter (factory) method for Pages.
  * @method static string|null partial(string $partial_name, array $args = []) Static getter (factory) method for Partials.
  *
- * @version 0.26.1
+ * @version 0.26.2
  * @author Teppo Koivula <teppo@wireframe-framework.com>
  * @license Mozilla Public License v2.0 https://mozilla.org/MPL/2.0/
  */

diff --git a/lib/Factory.php b/lib/Factory.php
@@ -14,7 +14,7 @@
 /**
  * Factory class for Wireframe
  *
- * @version 0.3.0
+ * @version 0.3.1
  * @author Teppo Koivula <teppo@wireframe-framework.com>
  * @license Mozilla Public License v2.0 https://mozilla.org/MPL/2.0/
  */
@@ -162,7 +162,7 @@ public static function component(string $component_name, array $args = []): \Wir
     public static function page($source, $args = []) {
 
         /** @var ProcessWire */
-        $wire = $args['wire'] ?? ($source instanceof Page ? $source->getWire() : wire());
+        $wire = $args['wire'] ?? ($source instanceof Page ? $source->getWire() ?? wire() : wire());
 
         // make sure that basic Wireframe features have been initialized
         if (!Wireframe::isInitialized($wire->instanceID)) {