Don't allow NULL values as return value for getSiteId()

aimeos · Jan 22, 2021 · ad99576 · ad99576
1 parent 95f9ec9
commit ad99576
Show file tree

Hide file tree

Showing 9 changed files with 25 additions and 26 deletions.
diff --git a/lib/mshoplib/src/MShop/Catalog/Item/Standard.php b/lib/mshoplib/src/MShop/Catalog/Item/Standard.php
@@ -116,11 +116,11 @@ public function setId( string $id = null ) : \Aimeos\MShop\Common\Item\Iface
 	/**
 	 * Returns the site ID of the item.
 	 *
-	 * @return string|null Site ID of the item
+	 * @return string Site ID of the item
 	 */
-	public function getSiteId() : ?string
+	public function getSiteId() : string
 	{
-		return ( $this->node->__isset( 'siteid' ) ? (string) $this->node->__get( 'siteid' ) : null );
+		return ( $this->node->__isset( 'siteid' ) ? (string) $this->node->__get( 'siteid' ) : '' );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Common/Item/Base.php b/lib/mshoplib/src/MShop/Common/Item/Base.php
@@ -281,10 +281,9 @@ public function setId( ?string $id ) : \Aimeos\MShop\Common\Item\Iface
 	/**
 	 * Returns the site ID of the item.
 	 *
-	 * @return string|null Site ID or null if no site id is available
-	 * @todo 2021.01 Don't allow NULL for returned value
+	 * @return string Site ID or null if no site id is available
 	 */
-	public function getSiteId() : ?string
+	public function getSiteId() : string
 	{
 		return $this->get( $this->prefix . 'siteid', $this->get( 'siteid', '' ) );
 	}

diff --git a/lib/mshoplib/src/MShop/Common/Item/Iface.php b/lib/mshoplib/src/MShop/Common/Item/Iface.php
@@ -96,9 +96,9 @@ public function setId( ?string $id ) : \Aimeos\MShop\Common\Item\Iface;
 	/**
 	 * Returns the ID of the site the item is stored
 	 *
-	 * @return string|null Site ID (or null if not available)
+	 * @return string Site ID (or null if not available)
 	 */
-	public function getSiteId() : ?string;
+	public function getSiteId() : string;
 
 	/**
 	 * Returns the create date of the item.

diff --git a/lib/mshoplib/src/MShop/Locale/Item/Standard.php b/lib/mshoplib/src/MShop/Locale/Item/Standard.php
@@ -100,11 +100,11 @@ public function getSitePath() : array
 	/**
 	 * Returns the Site ID of the item.
 	 *
-	 * @return string|null Site ID (or null for global site)
+	 * @return string Site ID (or null for global site)
 	 */
-	public function getSiteId() : ?string
+	public function getSiteId() : string
 	{
-		return $this->get( 'locale.siteid' );
+		return $this->get( 'locale.siteid', '' );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Order/Item/Base/Product/Attribute/Standard.php b/lib/mshoplib/src/MShop/Order/Item/Base/Product/Attribute/Standard.php
@@ -37,11 +37,11 @@ public function __construct( array $values = [] )
 	/**
 	 * Returns the ID of the site the item is stored
 	 *
-	 * @return string|null Site ID (or null if not available)
+	 * @return string Site ID (or null if not available)
 	 */
-	public function getSiteId() : ?string
+	public function getSiteId() : string
 	{
-		return $this->get( 'order.base.product.attribute.siteid' );
+		return $this->get( 'order.base.product.attribute.siteid', '' );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Order/Item/Base/Product/Standard.php b/lib/mshoplib/src/MShop/Order/Item/Base/Product/Standard.php
@@ -58,11 +58,11 @@ public function getSupplierItem() : ?\Aimeos\MShop\Supplier\Item\Iface
 	/**
 	 * Returns the ID of the site the item is stored
 	 *
-	 * @return string|null Site ID (or null if not available)
+	 * @return string Site ID (or null if not available)
 	 */
-	public function getSiteId() : ?string
+	public function getSiteId() : string
 	{
-		return $this->get( 'order.base.product.siteid' );
+		return $this->get( 'order.base.product.siteid', '' );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Order/Item/Base/Service/Attribute/Standard.php b/lib/mshoplib/src/MShop/Order/Item/Base/Service/Attribute/Standard.php
@@ -36,11 +36,11 @@ public function __construct( array $values = [] )
 	/**
 	 * Returns the ID of the site the item is stored
 	 *
-	 * @return string|null Site ID (or null if not available)
+	 * @return string Site ID (or null if not available)
 	 */
-	public function getSiteId() : ?string
+	public function getSiteId() : string
 	{
-		return $this->get( 'order.base.service.attribute.siteid' );
+		return $this->get( 'order.base.service.attribute.siteid', '' );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Order/Item/Base/Service/Standard.php b/lib/mshoplib/src/MShop/Order/Item/Base/Service/Standard.php
@@ -54,11 +54,11 @@ public function getServiceItem() : ?\Aimeos\MShop\Service\Item\Iface
 	/**
 	 * Returns the ID of the site the item is stored
 	 *
-	 * @return string|null Site ID (or null if not available)
+	 * @return string Site ID (or null if not available)
 	 */
-	public function getSiteId() : ?string
+	public function getSiteId() : string
 	{
-		return $this->get( 'order.base.service.siteid' );
+		return $this->get( 'order.base.service.siteid', '' );
 	}
 
 

diff --git a/lib/mshoplib/src/MShop/Order/Item/Base/Standard.php b/lib/mshoplib/src/MShop/Order/Item/Base/Standard.php
@@ -131,11 +131,11 @@ public function setId( ?string $id ) : \Aimeos\MShop\Common\Item\Iface
 	/**
 	 * Returns the ID of the site the item is stored.
 	 *
-	 * @return string|null Site ID (or null if not available)
+	 * @return string Site ID (or null if not available)
 	 */
-	public function getSiteId() : ?string
+	public function getSiteId() : string
 	{
-		return $this->get( 'order.base.siteid' );
+		return $this->get( 'order.base.siteid', '' );
 	}