From 38230d55654c613eb288e9295b0cb6758c537e45 Mon Sep 17 00:00:00 2001 From: Philip Iezzi Date: Wed, 16 Oct 2024 01:13:21 +0200 Subject: [PATCH 1/3] revert 278bdac which introduced property overrides of previously magically accessed properties --- library/Zend/Pdf/Element.php | 3 ++- library/Zend/Service/Rackspace/Files/Container.php | 2 +- library/Zend/Soap/Client/Local.php | 3 ++- library/Zend/Wildfire/Plugin/FirePhp.php | 3 ++- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/library/Zend/Pdf/Element.php b/library/Zend/Pdf/Element.php index 03806f7b01..2e929ff867 100644 --- a/library/Zend/Pdf/Element.php +++ b/library/Zend/Pdf/Element.php @@ -26,10 +26,11 @@ * @package Zend_Pdf * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @property mixed $value */ abstract class Zend_Pdf_Element { - public $value; public const TYPE_BOOL = 1; public const TYPE_NUMERIC = 2; public const TYPE_STRING = 3; diff --git a/library/Zend/Service/Rackspace/Files/Container.php b/library/Zend/Service/Rackspace/Files/Container.php index 290299ab22..660208fa51 100644 --- a/library/Zend/Service/Rackspace/Files/Container.php +++ b/library/Zend/Service/Rackspace/Files/Container.php @@ -22,9 +22,9 @@ require_once 'Zend/Service/Rackspace/Files.php'; +/** @property mixed $service */ class Zend_Service_Rackspace_Files_Container { - public $service; public const ERROR_PARAM_FILE_CONSTRUCT = 'The Zend_Service_Rackspace_Files passed in construction is not valid'; public const ERROR_PARAM_ARRAY_CONSTRUCT = 'The array passed in construction is not valid'; diff --git a/library/Zend/Soap/Client/Local.php b/library/Zend/Soap/Client/Local.php index 2d0f34e6d4..ce119294f8 100644 --- a/library/Zend/Soap/Client/Local.php +++ b/library/Zend/Soap/Client/Local.php @@ -39,10 +39,11 @@ * @category Zend * @package Zend_Soap * @subpackage Client + * + * @property Zend_Soap_Server $server */ class Zend_Soap_Client_Local extends Zend_Soap_Client { - public $server; /** * Server object * diff --git a/library/Zend/Wildfire/Plugin/FirePhp.php b/library/Zend/Wildfire/Plugin/FirePhp.php index 1bd93a2732..6a659527de 100644 --- a/library/Zend/Wildfire/Plugin/FirePhp.php +++ b/library/Zend/Wildfire/Plugin/FirePhp.php @@ -43,10 +43,11 @@ * @subpackage Plugin * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @property array $objectFilters */ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface { - public $objectFilters; /** * Plain log style. */ From e1f59677df6b3356d5a5db966e86372889be909c Mon Sep 17 00:00:00 2001 From: Philip Iezzi Date: Fri, 18 Oct 2024 22:06:34 +0200 Subject: [PATCH 2/3] Revert "revert 278bdac which introduced property overrides of previously magically accessed properties" This reverts commit 38230d55654c613eb288e9295b0cb6758c537e45. --- library/Zend/Pdf/Element.php | 3 +-- library/Zend/Service/Rackspace/Files/Container.php | 2 +- library/Zend/Soap/Client/Local.php | 3 +-- library/Zend/Wildfire/Plugin/FirePhp.php | 3 +-- 4 files changed, 4 insertions(+), 7 deletions(-) diff --git a/library/Zend/Pdf/Element.php b/library/Zend/Pdf/Element.php index 2e929ff867..03806f7b01 100644 --- a/library/Zend/Pdf/Element.php +++ b/library/Zend/Pdf/Element.php @@ -26,11 +26,10 @@ * @package Zend_Pdf * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * - * @property mixed $value */ abstract class Zend_Pdf_Element { + public $value; public const TYPE_BOOL = 1; public const TYPE_NUMERIC = 2; public const TYPE_STRING = 3; diff --git a/library/Zend/Service/Rackspace/Files/Container.php b/library/Zend/Service/Rackspace/Files/Container.php index 660208fa51..290299ab22 100644 --- a/library/Zend/Service/Rackspace/Files/Container.php +++ b/library/Zend/Service/Rackspace/Files/Container.php @@ -22,9 +22,9 @@ require_once 'Zend/Service/Rackspace/Files.php'; -/** @property mixed $service */ class Zend_Service_Rackspace_Files_Container { + public $service; public const ERROR_PARAM_FILE_CONSTRUCT = 'The Zend_Service_Rackspace_Files passed in construction is not valid'; public const ERROR_PARAM_ARRAY_CONSTRUCT = 'The array passed in construction is not valid'; diff --git a/library/Zend/Soap/Client/Local.php b/library/Zend/Soap/Client/Local.php index ce119294f8..2d0f34e6d4 100644 --- a/library/Zend/Soap/Client/Local.php +++ b/library/Zend/Soap/Client/Local.php @@ -39,11 +39,10 @@ * @category Zend * @package Zend_Soap * @subpackage Client - * - * @property Zend_Soap_Server $server */ class Zend_Soap_Client_Local extends Zend_Soap_Client { + public $server; /** * Server object * diff --git a/library/Zend/Wildfire/Plugin/FirePhp.php b/library/Zend/Wildfire/Plugin/FirePhp.php index 6a659527de..1bd93a2732 100644 --- a/library/Zend/Wildfire/Plugin/FirePhp.php +++ b/library/Zend/Wildfire/Plugin/FirePhp.php @@ -43,11 +43,10 @@ * @subpackage Plugin * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License - * - * @property array $objectFilters */ class Zend_Wildfire_Plugin_FirePhp implements Zend_Wildfire_Plugin_Interface { + public $objectFilters; /** * Plain log style. */ From cf7527e993d86d90515cbe55388b5242b18dcc00 Mon Sep 17 00:00:00 2001 From: Philip Iezzi Date: Fri, 18 Oct 2024 22:09:26 +0200 Subject: [PATCH 3/3] Revert undefined property declaration from 278bdac --- library/Zend/Pdf/Element.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/library/Zend/Pdf/Element.php b/library/Zend/Pdf/Element.php index 03806f7b01..2e929ff867 100644 --- a/library/Zend/Pdf/Element.php +++ b/library/Zend/Pdf/Element.php @@ -26,10 +26,11 @@ * @package Zend_Pdf * @copyright Copyright (c) 2005-2015 Zend Technologies USA Inc. (http://www.zend.com) * @license http://framework.zend.com/license/new-bsd New BSD License + * + * @property mixed $value */ abstract class Zend_Pdf_Element { - public $value; public const TYPE_BOOL = 1; public const TYPE_NUMERIC = 2; public const TYPE_STRING = 3;