Use PHP Macro package instead of own implementation

aimeos · Dec 10, 2021 · 7948411 · 7948411
1 parent c8df390
commit 7948411
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 214 deletions.
diff --git a/composer.json b/composer.json
@@ -26,6 +26,7 @@
 		"ext-PDO": "*",
 		"ext-zip": "*",
 		"aimeos/upscheme": "^0.7",
+		"aimeos/macro": "^1.0",
 		"aimeos/map": "^2.1",
 		"nyholm/psr7": "^1.2",
 		"doctrine/dbal": "~2.0||~3.0",

diff --git a/controller/jobs/src/Controller/Jobs/Base.php b/controller/jobs/src/Controller/Jobs/Base.php
@@ -19,9 +19,9 @@
  * @subpackage Jobs
  */
 abstract class Base
-	implements \Aimeos\MW\Macro\Iface
+	implements \Aimeos\Macro\Iface
 {
-	use \Aimeos\MW\Macro\Traits;
+	use \Aimeos\Macro\Macroable;
 
 
 	private $aimeos;

diff --git a/lib/mshoplib/src/MShop/Common/Item/Base.php b/lib/mshoplib/src/MShop/Common/Item/Base.php
@@ -20,9 +20,9 @@
  */
 abstract class Base
 	extends \Aimeos\MW\Common\Item\Base
-	implements \Aimeos\MShop\Common\Item\Iface, \Aimeos\MW\Macro\Iface, \ArrayAccess
+	implements \Aimeos\MShop\Common\Item\Iface, \Aimeos\Macro\Iface, \ArrayAccess
 {
-	use \Aimeos\MW\Macro\Traits;
+	use \Aimeos\Macro\Macroable;
 
 	private $available = true;
 	private $modified = false;

diff --git a/lib/mshoplib/src/MShop/Common/Manager/Base.php b/lib/mshoplib/src/MShop/Common/Manager/Base.php
@@ -22,10 +22,10 @@
  */
 abstract class Base
 	extends \Aimeos\MW\Common\Manager\Base
-	implements \Aimeos\MW\Macro\Iface
+	implements \Aimeos\Macro\Iface
 {
 	use \Aimeos\MShop\Common\Manager\Sub\Traits;
-	use \Aimeos\MW\Macro\Traits;
+	use \Aimeos\Macro\Macroable;
 
 
 	private $context;

diff --git a/lib/mshoplib/src/MShop/Coupon/Provider/Base.php b/lib/mshoplib/src/MShop/Coupon/Provider/Base.php
@@ -19,9 +19,9 @@
  * @subpackage Coupon
  */
 abstract class Base
-	implements Iface, \Aimeos\MW\Macro\Iface
+	implements Iface, \Aimeos\Macro\Iface
 {
-	use \Aimeos\MW\Macro\Traits;
+	use \Aimeos\Macro\Macroable;
 
 	private $context;
 	private $object;

diff --git a/lib/mshoplib/src/MShop/Order/Item/Base/Base.php b/lib/mshoplib/src/MShop/Order/Item/Base/Base.php
@@ -18,10 +18,10 @@
  * @package MShop
  * @subpackage Order
  */
-abstract class Base implements \Aimeos\MShop\Order\Item\Base\Iface, \Aimeos\MW\Macro\Iface, \ArrayAccess
+abstract class Base implements \Aimeos\MShop\Order\Item\Base\Iface, \Aimeos\Macro\Iface, \ArrayAccess
 {
 	use \Aimeos\MW\Observer\Publisher\Traits;
-	use \Aimeos\MW\Macro\Traits;
+	use \Aimeos\Macro\Macroable;
 
 
 	/**

diff --git a/lib/mshoplib/src/MShop/Plugin/Provider/Base.php b/lib/mshoplib/src/MShop/Plugin/Provider/Base.php
@@ -19,9 +19,9 @@
  * @subpackage Plugin
  */
 abstract class Base
-	implements \Aimeos\MW\Macro\Iface
+	implements \Aimeos\Macro\Iface
 {
-	use \Aimeos\MW\Macro\Traits;
+	use \Aimeos\Macro\Macroable;
 
 	private $item;
 	private $context;

diff --git a/lib/mshoplib/src/MShop/Rule/Provider/Base.php b/lib/mshoplib/src/MShop/Rule/Provider/Base.php
@@ -18,9 +18,9 @@
  * @subpackage Rule
  */
 abstract class Base
-	implements \Aimeos\MW\Macro\Iface
+	implements \Aimeos\Macro\Iface
 {
-	use \Aimeos\MW\Macro\Traits;
+	use \Aimeos\Macro\Macroable;
 
 	private $item;
 	private $context;

diff --git a/lib/mshoplib/src/MShop/Service/Provider/Base.php b/lib/mshoplib/src/MShop/Service/Provider/Base.php
@@ -19,9 +19,9 @@
  * @subpackage Service
  */
 abstract class Base
-	implements Iface, \Aimeos\MW\Macro\Iface
+	implements Iface, \Aimeos\Macro\Iface
 {
-	use \Aimeos\MW\Macro\Traits;
+	use \Aimeos\Macro\Macroable;
 
 	private $object;
 	private $context;

diff --git a/lib/mwlib/src/MW/Macro/Iface.php b/lib/mwlib/src/MW/Macro/Iface.php
diff --git a/lib/mwlib/src/MW/Macro/Traits.php b/lib/mwlib/src/MW/Macro/Traits.php
diff --git a/lib/mwlib/tests/MW/Macro/TraitsTest.php b/lib/mwlib/tests/MW/Macro/TraitsTest.php