From 71c2b5ba21ab785c78f7ed178399073832af6ec3 Mon Sep 17 00:00:00 2001
From: Claudio Sanches <contato@claudiosanches.com>
Date: Mon, 7 Sep 2020 15:01:07 -0300
Subject: [PATCH] Remove "package" tag from files inside "src" and "tests/php"
 (https://github.com/woocommerce/woocommerce-blocks/pull/2972)

* Don't require package tag or file comment inside src

* Removed package from file headers

* Fixed coding standards

* fix doc blocks for REST API

* update root classes

* update phpdoc blocks for Assets and Block classes

* Domain classes

* update phpdocs for payment classes

* update phpdocs for registry classes

* update utils classes phpdocs

* missed saving one file

Co-authored-by: Darren Ethier <darren@roughsmootheng.in>
---
 plugins/woocommerce-blocks/phpcs.xml          |  9 ++++++++
 plugins/woocommerce-blocks/src/Assets.php     | 11 +++-------
 plugins/woocommerce-blocks/src/Assets/Api.php |  8 ++-----
 .../src/Assets/AssetDataRegistry.php          | 11 +++-------
 .../Assets/BackCompatAssetDataRegistry.php    |  8 +------
 .../src/BlockTypes/AbstractBlock.php          |  8 -------
 .../src/BlockTypes/AbstractDynamicBlock.php   |  8 -------
 .../src/BlockTypes/AbstractProductGrid.php    |  8 -------
 .../src/BlockTypes/ActiveFilters.php          |  8 -------
 .../src/BlockTypes/AllProducts.php            |  8 -------
 .../src/BlockTypes/AllReviews.php             |  8 -------
 .../src/BlockTypes/AtomicBlock.php            | 10 ++-------
 .../src/BlockTypes/AttributeFilter.php        |  8 -------
 .../src/BlockTypes/Cart.php                   | 10 ++-------
 .../src/BlockTypes/Checkout.php               | 10 ++-------
 .../src/BlockTypes/FeaturedCategory.php       |  8 -------
 .../src/BlockTypes/FeaturedProduct.php        |  8 -------
 .../src/BlockTypes/HandpickedProducts.php     |  8 -------
 .../src/BlockTypes/PriceFilter.php            |  8 -------
 .../src/BlockTypes/ProductBestSellers.php     |  8 -------
 .../src/BlockTypes/ProductCategories.php      |  8 -------
 .../src/BlockTypes/ProductCategory.php        |  8 -------
 .../src/BlockTypes/ProductNew.php             |  8 -------
 .../src/BlockTypes/ProductOnSale.php          |  8 -------
 .../src/BlockTypes/ProductSearch.php          |  8 -------
 .../src/BlockTypes/ProductTag.php             |  8 -------
 .../src/BlockTypes/ProductTopRated.php        |  8 -------
 .../src/BlockTypes/ProductsByAttribute.php    |  8 -------
 .../src/BlockTypes/ReviewsByCategory.php      |  8 -------
 .../src/BlockTypes/ReviewsByProduct.php       |  8 -------
 .../src/BlockTypes/SingleProduct.php          |  8 -------
 .../src/Domain/Bootstrap.php                  |  6 -----
 .../woocommerce-blocks/src/Domain/Package.php |  8 ++-----
 .../src/Domain/Services/DraftOrders.php       | 10 ++++-----
 plugins/woocommerce-blocks/src/Installer.php  | 11 +++-------
 plugins/woocommerce-blocks/src/Library.php    | 11 +++-------
 plugins/woocommerce-blocks/src/Package.php    | 22 +++++++------------
 .../woocommerce-blocks/src/Payments/Api.php   |  8 -------
 .../AbstractPaymentMethodType.php             |  8 -------
 .../Payments/Integrations/BankTransfer.php    |  7 ------
 .../Payments/Integrations/CashOnDelivery.php  |  7 ------
 .../src/Payments/Integrations/Cheque.php      |  7 ------
 .../src/Payments/Integrations/PayPal.php      |  7 ------
 .../src/Payments/Integrations/Stripe.php      | 13 ++++-------
 .../src/Payments/PaymentContext.php           |  8 -------
 .../src/Payments/PaymentMethodRegistry.php    |  6 -----
 .../Payments/PaymentMethodTypeInterface.php   |  8 -------
 .../src/Payments/PaymentResult.php            |  8 -------
 .../src/Registry/AbstractDependencyType.php   |  6 -----
 .../src/Registry/Container.php                | 10 ++-------
 .../src/Registry/FactoryType.php              |  6 -----
 .../src/Registry/SharedType.php               |  6 -----
 plugins/woocommerce-blocks/src/RestApi.php    | 11 +++-------
 .../src/StoreApi/Routes/AbstractCartRoute.php | 12 +++-------
 .../src/StoreApi/Routes/AbstractRoute.php     | 11 ++--------
 .../StoreApi/Routes/AbstractTermsRoute.php    | 11 ++--------
 .../src/StoreApi/Routes/Cart.php              | 10 ++-------
 .../src/StoreApi/Routes/CartAddItem.php       | 10 ++-------
 .../src/StoreApi/Routes/CartApplyCoupon.php   | 10 ++-------
 .../src/StoreApi/Routes/CartCoupons.php       | 11 ++--------
 .../src/StoreApi/Routes/CartCouponsByCode.php | 11 ++--------
 .../src/StoreApi/Routes/CartItems.php         | 11 ++--------
 .../src/StoreApi/Routes/CartItemsByKey.php    | 11 ++--------
 .../src/StoreApi/Routes/CartRemoveCoupon.php  | 10 ++-------
 .../src/StoreApi/Routes/CartRemoveItem.php    | 10 ++-------
 .../Routes/CartSelectShippingRate.php         | 10 ++-------
 .../src/StoreApi/Routes/CartUpdateItem.php    | 10 ++-------
 .../StoreApi/Routes/CartUpdateShipping.php    | 10 ++-------
 .../src/StoreApi/Routes/Checkout.php          | 10 ++-------
 .../StoreApi/Routes/ProductAttributeTerms.php | 11 ++--------
 .../src/StoreApi/Routes/ProductAttributes.php | 11 ++--------
 .../StoreApi/Routes/ProductAttributesById.php | 11 ++--------
 .../src/StoreApi/Routes/ProductCategories.php | 11 ++--------
 .../StoreApi/Routes/ProductCategoriesById.php | 11 ++--------
 .../StoreApi/Routes/ProductCollectionData.php | 16 +++++---------
 .../src/StoreApi/Routes/ProductReviews.php    | 11 ++--------
 .../src/StoreApi/Routes/ProductTags.php       | 11 ++--------
 .../src/StoreApi/Routes/Products.php          | 11 ++--------
 .../src/StoreApi/Routes/ProductsById.php      | 11 ++--------
 .../src/StoreApi/Routes/RouteException.php    |  8 ++-----
 .../src/StoreApi/Routes/RouteInterface.php    | 10 ++-------
 .../src/StoreApi/RoutesController.php         | 11 ++--------
 .../src/StoreApi/SchemaController.php         | 11 ++--------
 .../src/StoreApi/Schemas/AbstractSchema.php   | 15 ++++---------
 .../StoreApi/Schemas/BillingAddressSchema.php | 10 ++-------
 .../src/StoreApi/Schemas/CartCouponSchema.php |  9 +-------
 .../src/StoreApi/Schemas/CartItemSchema.php   |  9 +-------
 .../src/StoreApi/Schemas/CartSchema.php       |  9 +-------
 .../Schemas/CartShippingRateSchema.php        | 10 ++-------
 .../src/StoreApi/Schemas/CheckoutSchema.php   | 10 ++-------
 .../src/StoreApi/Schemas/ErrorSchema.php      |  9 +-------
 .../Schemas/ImageAttachmentSchema.php         | 10 ++-------
 .../StoreApi/Schemas/OrderCouponSchema.php    | 10 ++-------
 .../Schemas/ProductAttributeSchema.php        |  9 +-------
 .../Schemas/ProductCategorySchema.php         | 10 ++-------
 .../Schemas/ProductCollectionDataSchema.php   |  9 +-------
 .../StoreApi/Schemas/ProductReviewSchema.php  | 10 ++-------
 .../src/StoreApi/Schemas/ProductSchema.php    |  9 +-------
 .../Schemas/ShippingAddressSchema.php         |  9 +-------
 .../src/StoreApi/Schemas/TermSchema.php       |  9 +-------
 .../src/StoreApi/Utilities/CartController.php | 10 ++-------
 .../src/StoreApi/Utilities/NoticeHandler.php  | 11 +++-------
 .../StoreApi/Utilities/OrderController.php    | 11 +++-------
 .../src/StoreApi/Utilities/Pagination.php     |  9 +-------
 .../src/StoreApi/Utilities/ProductQuery.php   | 10 ++-------
 .../Utilities/ProductQueryFilters.php         |  9 +-------
 .../src/StoreApi/Utilities/ReserveStock.php   | 11 +++-------
 .../Utilities/ReserveStockException.php       |  9 +++-----
 .../src/Utils/BlocksWpQuery.php               | 13 +++--------
 .../tests/php/Bootstrap/MainFile.php          |  2 --
 .../tests/php/Helpers/TestValidateSchema.php  |  2 --
 .../tests/php/Helpers/ValidateSchema.php      |  2 --
 .../tests/php/StoreApi/Routes/Cart.php        |  2 --
 .../tests/php/StoreApi/Routes/CartCoupons.php |  2 --
 .../tests/php/StoreApi/Routes/CartItems.php   |  2 --
 .../StoreApi/Routes/ProductAttributeTerms.php |  2 --
 .../php/StoreApi/Routes/ProductAttributes.php |  2 --
 .../StoreApi/Routes/ProductCollectionData.php |  2 --
 .../tests/php/StoreApi/Routes/Products.php    |  2 --
 .../php/StoreApi/Utilities/ReserveStock.php   |  2 --
 120 files changed, 165 insertions(+), 894 deletions(-)

diff --git a/plugins/woocommerce-blocks/phpcs.xml b/plugins/woocommerce-blocks/phpcs.xml
index 34940a811cb..316359a194f 100644
--- a/plugins/woocommerce-blocks/phpcs.xml
+++ b/plugins/woocommerce-blocks/phpcs.xml
@@ -36,6 +36,15 @@
 		<exclude-pattern>tests/*</exclude-pattern>
 	</rule>
 
+	<rule ref="Squiz.Commenting.FileComment.MissingPackageTag">
+		<exclude-pattern>src/</exclude-pattern>
+		<exclude-pattern>tests/php</exclude-pattern>
+	</rule>
+	<rule ref="Squiz.Commenting.FileComment.Missing">
+		<exclude-pattern>src/</exclude-pattern>
+		<exclude-pattern>tests/php</exclude-pattern>
+	</rule>
+
 	<rule ref="Generic.Commenting">
 		<exclude-pattern>tests/</exclude-pattern>
 	</rule>
diff --git a/plugins/woocommerce-blocks/src/Assets.php b/plugins/woocommerce-blocks/src/Assets.php
index f2e5368a668..28e9fbc77f0 100644
--- a/plugins/woocommerce-blocks/src/Assets.php
+++ b/plugins/woocommerce-blocks/src/Assets.php
@@ -1,19 +1,14 @@
 <?php
-/**
- * Initializes block assets.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\Package;
 use Automattic\WooCommerce\Blocks\Assets\Api as AssetApi;
 
 /**
  * Assets class.
+ * Initializes block assets.
+ *
+ * @internal
  */
 class Assets {
 
diff --git a/plugins/woocommerce-blocks/src/Assets/Api.php b/plugins/woocommerce-blocks/src/Assets/Api.php
index dccea5ba4aa..1a458238594 100644
--- a/plugins/woocommerce-blocks/src/Assets/Api.php
+++ b/plugins/woocommerce-blocks/src/Assets/Api.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Contains asset api methods
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\Assets;
 
 use Automattic\WooCommerce\Blocks\Domain\Package;
@@ -12,6 +6,8 @@ use Automattic\WooCommerce\Blocks\Domain\Package;
 /**
  * The Api class provides an interface to various asset registration helpers.
  *
+ * Contains asset api methods
+ *
  * @since 2.5.0
  */
 class Api {
diff --git a/plugins/woocommerce-blocks/src/Assets/AssetDataRegistry.php b/plugins/woocommerce-blocks/src/Assets/AssetDataRegistry.php
index 38c20f15a65..8b7224519ac 100644
--- a/plugins/woocommerce-blocks/src/Assets/AssetDataRegistry.php
+++ b/plugins/woocommerce-blocks/src/Assets/AssetDataRegistry.php
@@ -1,12 +1,4 @@
 <?php
-/**
- * Holds data registered for output on the current view session when
- * `wc-settings` is enqueued (directly or via dependency)
- *
- * @package WooCommerce/Blocks
- * @since 2.5.0
- */
-
 namespace Automattic\WooCommerce\Blocks\Assets;
 
 use Exception;
@@ -16,6 +8,9 @@ use InvalidArgumentException;
  * Class instance for registering data used on the current view session by
  * assets.
  *
+ * Holds data registered for output on the current view session when
+ * `wc-settings` is enqueued( directly or via dependency )
+ *
  * @since 2.5.0
  */
 class AssetDataRegistry {
diff --git a/plugins/woocommerce-blocks/src/Assets/BackCompatAssetDataRegistry.php b/plugins/woocommerce-blocks/src/Assets/BackCompatAssetDataRegistry.php
index 0a87c2c7c50..4af0b11c0f0 100644
--- a/plugins/woocommerce-blocks/src/Assets/BackCompatAssetDataRegistry.php
+++ b/plugins/woocommerce-blocks/src/Assets/BackCompatAssetDataRegistry.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * Backwards Compatibility file for plugins using wcSettings in prior versions
- *
- * @package WooCommerce/Blocks
- * @since 2.5.0
- */
-
 namespace Automattic\WooCommerce\Blocks\Assets;
 
 /**
@@ -13,6 +6,7 @@ namespace Automattic\WooCommerce\Blocks\Assets;
  *
  * Note: This will be removed at some point.
  *
+ * @internal
  * @since 2.5.0
  */
 class BackCompatAssetDataRegistry extends AssetDataRegistry {
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/AbstractBlock.php b/plugins/woocommerce-blocks/src/BlockTypes/AbstractBlock.php
index 06d553fa21d..336303bd7c1 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/AbstractBlock.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/AbstractBlock.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Abstract block class.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * AbstractBlock class.
  */
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/AbstractDynamicBlock.php b/plugins/woocommerce-blocks/src/BlockTypes/AbstractDynamicBlock.php
index bc037da79d7..163d9b5003f 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/AbstractDynamicBlock.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/AbstractDynamicBlock.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Abstract dynamic block class.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * AbstractDynamicBlock class.
  */
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/AbstractProductGrid.php b/plugins/woocommerce-blocks/src/BlockTypes/AbstractProductGrid.php
index 4e8c2885d3f..a54748f620e 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/AbstractProductGrid.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/AbstractProductGrid.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Class for product grid functionality
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\Utils\BlocksWpQuery;
 
 /**
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/ActiveFilters.php b/plugins/woocommerce-blocks/src/BlockTypes/ActiveFilters.php
index 0c02d99ba71..1f1135fb365 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/ActiveFilters.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/ActiveFilters.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Active filters block.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\Assets;
 
 /**
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/AllProducts.php b/plugins/woocommerce-blocks/src/BlockTypes/AllProducts.php
index c4933cb5508..682dff5c736 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/AllProducts.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/AllProducts.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * All products block.
- *
- * @package WooCommerce\Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * AllProducts class.
  */
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/AllReviews.php b/plugins/woocommerce-blocks/src/BlockTypes/AllReviews.php
index 08d47171a58..1cff8ba0a71 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/AllReviews.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/AllReviews.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Reviews by Product block.
- *
- * @package WooCommerce\Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\Assets;
 
 /**
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/AtomicBlock.php b/plugins/woocommerce-blocks/src/BlockTypes/AtomicBlock.php
index 7aca65acbd1..cc47d64ffff 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/AtomicBlock.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/AtomicBlock.php
@@ -1,16 +1,10 @@
 <?php
-/**
- * Atomic blocks.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * AtomicBlock class.
+ *
+ * @internal
  */
 class AtomicBlock extends AbstractBlock {
 	/**
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/AttributeFilter.php b/plugins/woocommerce-blocks/src/BlockTypes/AttributeFilter.php
index 52ffccc309c..b4492fc8d15 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/AttributeFilter.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/AttributeFilter.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Attribute filter block.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\Assets;
 
 /**
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/Cart.php b/plugins/woocommerce-blocks/src/BlockTypes/Cart.php
index bb5868e2864..947bdeafa91 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/Cart.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/Cart.php
@@ -1,20 +1,14 @@
 <?php
-/**
- * Cart block.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
 use Automattic\WooCommerce\Blocks\Package;
 use Automattic\WooCommerce\Blocks\Assets;
 use Automattic\WooCommerce\Blocks\Assets\AssetDataRegistry;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * Cart class.
+ *
+ * @internal
  */
 class Cart extends AbstractBlock {
 	/**
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/Checkout.php b/plugins/woocommerce-blocks/src/BlockTypes/Checkout.php
index b4dc616c2f5..773e025926b 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/Checkout.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/Checkout.php
@@ -1,20 +1,14 @@
 <?php
-/**
- * Checkout block.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
 use Automattic\WooCommerce\Blocks\Package;
 use Automattic\WooCommerce\Blocks\Assets;
 use Automattic\WooCommerce\Blocks\Assets\AssetDataRegistry;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * Checkout class.
+ *
+ * @internal
  */
 class Checkout extends AbstractBlock {
 
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/FeaturedCategory.php b/plugins/woocommerce-blocks/src/BlockTypes/FeaturedCategory.php
index 72e75564a27..8413c075711 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/FeaturedCategory.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/FeaturedCategory.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Featured category block.
- *
- * @package WooCommerce\Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * FeaturedCategory class.
  */
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/FeaturedProduct.php b/plugins/woocommerce-blocks/src/BlockTypes/FeaturedProduct.php
index 0202a60046e..256e98145a8 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/FeaturedProduct.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/FeaturedProduct.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Featured products block.
- *
- * @package WooCommerce\Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * FeaturedProduct class.
  */
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/HandpickedProducts.php b/plugins/woocommerce-blocks/src/BlockTypes/HandpickedProducts.php
index 0906fede5e5..6dcb9c920ed 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/HandpickedProducts.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/HandpickedProducts.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Hand-picked Products block.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * HandpickedProducts class.
  */
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/PriceFilter.php b/plugins/woocommerce-blocks/src/BlockTypes/PriceFilter.php
index 6c748007650..5f9837542c7 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/PriceFilter.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/PriceFilter.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Price filter block.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\Assets;
 
 /**
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/ProductBestSellers.php b/plugins/woocommerce-blocks/src/BlockTypes/ProductBestSellers.php
index 7cc1e1b14b6..b1cc4467775 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/ProductBestSellers.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/ProductBestSellers.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Product best sellers block.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductBestSellers class.
  */
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/ProductCategories.php b/plugins/woocommerce-blocks/src/BlockTypes/ProductCategories.php
index cc77dfdace1..74ecda6ff1a 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/ProductCategories.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/ProductCategories.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Product categories block.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductCategories class.
  */
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/ProductCategory.php b/plugins/woocommerce-blocks/src/BlockTypes/ProductCategory.php
index b17535b34fa..9a3c5cf1150 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/ProductCategory.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/ProductCategory.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Product category block.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductCategory class.
  */
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/ProductNew.php b/plugins/woocommerce-blocks/src/BlockTypes/ProductNew.php
index df9c1a49939..d2ac9acee72 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/ProductNew.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/ProductNew.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * New products block.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductNew class.
  */
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/ProductOnSale.php b/plugins/woocommerce-blocks/src/BlockTypes/ProductOnSale.php
index 975edb8d48c..d68cd028d2f 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/ProductOnSale.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/ProductOnSale.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * On-sale products block.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductOnSale class.
  */
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/ProductSearch.php b/plugins/woocommerce-blocks/src/BlockTypes/ProductSearch.php
index 6bab7c31d36..500a68424f3 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/ProductSearch.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/ProductSearch.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Product search block.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductSearch class.
  */
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/ProductTag.php b/plugins/woocommerce-blocks/src/BlockTypes/ProductTag.php
index 6f361afad69..e8ab5a062f4 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/ProductTag.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/ProductTag.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Product tag block.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductTag class.
  */
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/ProductTopRated.php b/plugins/woocommerce-blocks/src/BlockTypes/ProductTopRated.php
index db9cb781d6f..db3cfbc7b39 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/ProductTopRated.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/ProductTopRated.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Top rated products block.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductTopRated class.
  */
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/ProductsByAttribute.php b/plugins/woocommerce-blocks/src/BlockTypes/ProductsByAttribute.php
index 310f90dd6fd..01144b84458 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/ProductsByAttribute.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/ProductsByAttribute.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Products by attribute block.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductsByAttribute class.
  */
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/ReviewsByCategory.php b/plugins/woocommerce-blocks/src/BlockTypes/ReviewsByCategory.php
index 5ba10d3e9f4..a83ee8f4d2c 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/ReviewsByCategory.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/ReviewsByCategory.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Reviews by Product block.
- *
- * @package WooCommerce\Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\Assets;
 
 /**
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/ReviewsByProduct.php b/plugins/woocommerce-blocks/src/BlockTypes/ReviewsByProduct.php
index 14072e916b2..b769770c914 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/ReviewsByProduct.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/ReviewsByProduct.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Reviews by Product block.
- *
- * @package WooCommerce\Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\Assets;
 
 /**
diff --git a/plugins/woocommerce-blocks/src/BlockTypes/SingleProduct.php b/plugins/woocommerce-blocks/src/BlockTypes/SingleProduct.php
index 168ebedcafa..71f4dc9f320 100644
--- a/plugins/woocommerce-blocks/src/BlockTypes/SingleProduct.php
+++ b/plugins/woocommerce-blocks/src/BlockTypes/SingleProduct.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Single Product block.
- *
- * @package WooCommerce\Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\BlockTypes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\Assets;
 
 /**
diff --git a/plugins/woocommerce-blocks/src/Domain/Bootstrap.php b/plugins/woocommerce-blocks/src/Domain/Bootstrap.php
index 242a293e0e5..bfa044539c2 100644
--- a/plugins/woocommerce-blocks/src/Domain/Bootstrap.php
+++ b/plugins/woocommerce-blocks/src/Domain/Bootstrap.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Contains the Bootstrap class
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\Domain;
 
 use Automattic\WooCommerce\Blocks\Assets as BlockAssets;
diff --git a/plugins/woocommerce-blocks/src/Domain/Package.php b/plugins/woocommerce-blocks/src/Domain/Package.php
index 92298448353..38f5e96a287 100644
--- a/plugins/woocommerce-blocks/src/Domain/Package.php
+++ b/plugins/woocommerce-blocks/src/Domain/Package.php
@@ -1,15 +1,11 @@
 <?php
-/**
- * Returns information about the package and handles init.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\Domain;
 
 /**
  * Main package class.
  *
+ * Returns information about the package and handles init.
+ *
  * @since 2.5.0
  */
 class Package {
diff --git a/plugins/woocommerce-blocks/src/Domain/Services/DraftOrders.php b/plugins/woocommerce-blocks/src/Domain/Services/DraftOrders.php
index 9f713c2975e..dd1e308a1d5 100644
--- a/plugins/woocommerce-blocks/src/Domain/Services/DraftOrders.php
+++ b/plugins/woocommerce-blocks/src/Domain/Services/DraftOrders.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Sets up all logic related to the Checkout Draft Orders service
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\Domain\Services;
 
 use Automattic\WooCommerce\Blocks\Domain\Package;
@@ -13,6 +7,10 @@ use WC_Order;
 
 /**
  * Service class for adding DraftOrder functionality to WooCommerce core.
+ *
+ * Sets up all logic related to the Checkout Draft Orders service
+ *
+ * @internal
  */
 class DraftOrders {
 
diff --git a/plugins/woocommerce-blocks/src/Installer.php b/plugins/woocommerce-blocks/src/Installer.php
index ebd3defbf12..78f60ad99bf 100644
--- a/plugins/woocommerce-blocks/src/Installer.php
+++ b/plugins/woocommerce-blocks/src/Installer.php
@@ -1,16 +1,11 @@
 <?php
-/**
- * Handles installation of Blocks plugin dependencies.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * Installer class.
+ * Handles installation of Blocks plugin dependencies.
+ *
+ * @internal
  */
 class Installer {
 	/**
diff --git a/plugins/woocommerce-blocks/src/Library.php b/plugins/woocommerce-blocks/src/Library.php
index 37df36570d6..52ffec8cf44 100644
--- a/plugins/woocommerce-blocks/src/Library.php
+++ b/plugins/woocommerce-blocks/src/Library.php
@@ -1,18 +1,13 @@
 <?php
-/**
- * Initializes blocks in WordPress.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\Package;
 
 /**
  * Library class.
+ * Initializes blocks in WordPress.
+ *
+ * @internal
  */
 class Library {
 
diff --git a/plugins/woocommerce-blocks/src/Package.php b/plugins/woocommerce-blocks/src/Package.php
index 4f95356ee6b..766b58768b6 100644
--- a/plugins/woocommerce-blocks/src/Package.php
+++ b/plugins/woocommerce-blocks/src/Package.php
@@ -1,5 +1,13 @@
 <?php
+namespace Automattic\WooCommerce\Blocks;
+
+use Automattic\WooCommerce\Blocks\Domain\Package as NewPackage;
+use Automattic\WooCommerce\Blocks\Domain\Bootstrap;
+use Automattic\WooCommerce\Blocks\Registry\Container;
+
 /**
+ * Main package class.
+ *
  * Returns information about the package and handles init.
  *
  * In the context of this plugin, it handles init and is called from the main
@@ -8,20 +16,6 @@
  * In the context of WooCommere core, it handles init and is called from
  * WooCommerce's package loader. The main plugin file is _not_ loaded.
  *
- * @package Automattic/WooCommerce/Blocks
- */
-
-namespace Automattic\WooCommerce\Blocks;
-
-use Automattic\WooCommerce\Blocks\Domain\Package as NewPackage;
-use Automattic\WooCommerce\Blocks\Domain\Bootstrap;
-use Automattic\WooCommerce\Blocks\Registry\Container;
-
-defined( 'ABSPATH' ) || exit;
-
-/**
- * Main package class.
- *
  * @since 2.5.0
  */
 class Package {
diff --git a/plugins/woocommerce-blocks/src/Payments/Api.php b/plugins/woocommerce-blocks/src/Payments/Api.php
index f1af7bfef12..5cd1e01179e 100644
--- a/plugins/woocommerce-blocks/src/Payments/Api.php
+++ b/plugins/woocommerce-blocks/src/Payments/Api.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Payment Api class.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\Payments;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\Package;
 use Automattic\WooCommerce\Blocks\Assets\AssetDataRegistry;
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\NoticeHandler;
diff --git a/plugins/woocommerce-blocks/src/Payments/Integrations/AbstractPaymentMethodType.php b/plugins/woocommerce-blocks/src/Payments/Integrations/AbstractPaymentMethodType.php
index 7bbc48a432a..fcfc4400a47 100644
--- a/plugins/woocommerce-blocks/src/Payments/Integrations/AbstractPaymentMethodType.php
+++ b/plugins/woocommerce-blocks/src/Payments/Integrations/AbstractPaymentMethodType.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Abstract payment method type class.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\Payments\Integrations;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\Payments\PaymentMethodTypeInterface;
 
 /**
diff --git a/plugins/woocommerce-blocks/src/Payments/Integrations/BankTransfer.php b/plugins/woocommerce-blocks/src/Payments/Integrations/BankTransfer.php
index ee53b96d19c..260a6cbfded 100644
--- a/plugins/woocommerce-blocks/src/Payments/Integrations/BankTransfer.php
+++ b/plugins/woocommerce-blocks/src/Payments/Integrations/BankTransfer.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * Bank Transfer (BACS) (core) gateway implementation.
- *
- * @package WooCommerce/Blocks
- * @since 3.0.0
- */
-
 namespace Automattic\WooCommerce\Blocks\Payments\Integrations;
 
 use Automattic\WooCommerce\Blocks\Assets\Api;
diff --git a/plugins/woocommerce-blocks/src/Payments/Integrations/CashOnDelivery.php b/plugins/woocommerce-blocks/src/Payments/Integrations/CashOnDelivery.php
index 9c746655e8f..9aff31006a7 100644
--- a/plugins/woocommerce-blocks/src/Payments/Integrations/CashOnDelivery.php
+++ b/plugins/woocommerce-blocks/src/Payments/Integrations/CashOnDelivery.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * Cash on Delivery (COD) (core) gateway implementation.
- *
- * @package WooCommerce/Blocks
- * @since 3.0.0
- */
-
 namespace Automattic\WooCommerce\Blocks\Payments\Integrations;
 
 use Automattic\WooCommerce\Blocks\Assets\Api;
diff --git a/plugins/woocommerce-blocks/src/Payments/Integrations/Cheque.php b/plugins/woocommerce-blocks/src/Payments/Integrations/Cheque.php
index d2a2bf397ad..0702aed5109 100644
--- a/plugins/woocommerce-blocks/src/Payments/Integrations/Cheque.php
+++ b/plugins/woocommerce-blocks/src/Payments/Integrations/Cheque.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * Cheque (core) gateway implementation.
- *
- * @package WooCommerce/Blocks
- * @since 2.6.0
- */
-
 namespace Automattic\WooCommerce\Blocks\Payments\Integrations;
 
 use Exception;
diff --git a/plugins/woocommerce-blocks/src/Payments/Integrations/PayPal.php b/plugins/woocommerce-blocks/src/Payments/Integrations/PayPal.php
index 35f7651dfa2..3e87acf0935 100644
--- a/plugins/woocommerce-blocks/src/Payments/Integrations/PayPal.php
+++ b/plugins/woocommerce-blocks/src/Payments/Integrations/PayPal.php
@@ -1,11 +1,4 @@
 <?php
-/**
- * PayPal Standard (core) gateway implementation.
- *
- * @package WooCommerce/Blocks
- * @since 2.6.0
- */
-
 namespace Automattic\WooCommerce\Blocks\Payments\Integrations;
 
 use Exception;
diff --git a/plugins/woocommerce-blocks/src/Payments/Integrations/Stripe.php b/plugins/woocommerce-blocks/src/Payments/Integrations/Stripe.php
index 9d8b2ed8ff6..51207804579 100644
--- a/plugins/woocommerce-blocks/src/Payments/Integrations/Stripe.php
+++ b/plugins/woocommerce-blocks/src/Payments/Integrations/Stripe.php
@@ -1,13 +1,4 @@
 <?php
-/**
- * Temporary integration of the stripe payment method for the new cart and
- * checkout blocks. Once the api is demonstrated to be stable, this integration
- * will be moved to the Stripe extension
- *
- * @package WooCommerce/Blocks
- * @since 2.6.0
- */
-
 namespace Automattic\WooCommerce\Blocks\Payments\Integrations;
 
 use Exception;
@@ -20,6 +11,10 @@ use Automattic\WooCommerce\Blocks\Payments\PaymentResult;
 /**
  * Stripe payment method integration
  *
+ * Temporary integration of the stripe payment method for the new cart and
+ * checkout blocks. Once the api is demonstrated to be stable, this integration
+ * will be moved to the Stripe extension
+ *
  * @since 2.6.0
  */
 final class Stripe extends AbstractPaymentMethodType {
diff --git a/plugins/woocommerce-blocks/src/Payments/PaymentContext.php b/plugins/woocommerce-blocks/src/Payments/PaymentContext.php
index c4e9e54120b..66b23a23804 100644
--- a/plugins/woocommerce-blocks/src/Payments/PaymentContext.php
+++ b/plugins/woocommerce-blocks/src/Payments/PaymentContext.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Payment context.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\Payments;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * PaymentContext class.
  */
diff --git a/plugins/woocommerce-blocks/src/Payments/PaymentMethodRegistry.php b/plugins/woocommerce-blocks/src/Payments/PaymentMethodRegistry.php
index 0e5cd682651..6a036ed8490 100644
--- a/plugins/woocommerce-blocks/src/Payments/PaymentMethodRegistry.php
+++ b/plugins/woocommerce-blocks/src/Payments/PaymentMethodRegistry.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Holds data about registered payment methods.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\Payments;
 
 /**
diff --git a/plugins/woocommerce-blocks/src/Payments/PaymentMethodTypeInterface.php b/plugins/woocommerce-blocks/src/Payments/PaymentMethodTypeInterface.php
index ef0dd4652e2..71e6b3e1d2c 100644
--- a/plugins/woocommerce-blocks/src/Payments/PaymentMethodTypeInterface.php
+++ b/plugins/woocommerce-blocks/src/Payments/PaymentMethodTypeInterface.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Payment method type interface.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\Payments;
 
-defined( 'ABSPATH' ) || exit;
-
 interface PaymentMethodTypeInterface {
 	/**
 	 * The name of the payment method
diff --git a/plugins/woocommerce-blocks/src/Payments/PaymentResult.php b/plugins/woocommerce-blocks/src/Payments/PaymentResult.php
index c34fd5428f4..1c69a9054d5 100644
--- a/plugins/woocommerce-blocks/src/Payments/PaymentResult.php
+++ b/plugins/woocommerce-blocks/src/Payments/PaymentResult.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Payment result.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\Payments;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * PaymentResult class.
  */
diff --git a/plugins/woocommerce-blocks/src/Registry/AbstractDependencyType.php b/plugins/woocommerce-blocks/src/Registry/AbstractDependencyType.php
index 2c867fcade0..43be40ddeb6 100644
--- a/plugins/woocommerce-blocks/src/Registry/AbstractDependencyType.php
+++ b/plugins/woocommerce-blocks/src/Registry/AbstractDependencyType.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Holds the AbstractDependencyType class.
- *
- * @package WooCommerce\Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\Registry;
 
 /**
diff --git a/plugins/woocommerce-blocks/src/Registry/Container.php b/plugins/woocommerce-blocks/src/Registry/Container.php
index 1f0f60450c0..9776a609a86 100644
--- a/plugins/woocommerce-blocks/src/Registry/Container.php
+++ b/plugins/woocommerce-blocks/src/Registry/Container.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Contains the Container class.
- *
- * @package WooCommerce\Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\Registry;
 
 use Closure;
@@ -30,7 +24,7 @@ class Container {
 	 * Public api for adding a factory to the container.
 	 *
 	 * Factory dependencies will have the instantiation callback invoked
-	 * everytime the dependency is requested.
+	 * every time the dependency is requested.
 	 *
 	 * Typical Usage:
 	 *
@@ -58,7 +52,7 @@ class Container {
 	 * that it will be a single instance shared among any other classes having
 	 * that dependency.
 	 *
-	 * If you want a new instance everytime it's required, then wrap the value
+	 * If you want a new instance every time it's required, then wrap the value
 	 * in a call to the factory method (@see Container::factory for example)
 	 *
 	 * Note: Currently if the provided id already is registered in the container,
diff --git a/plugins/woocommerce-blocks/src/Registry/FactoryType.php b/plugins/woocommerce-blocks/src/Registry/FactoryType.php
index f9dd8672ea8..ad99403fee8 100644
--- a/plugins/woocommerce-blocks/src/Registry/FactoryType.php
+++ b/plugins/woocommerce-blocks/src/Registry/FactoryType.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Holds the FactoryType class
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\Registry;
 
 /**
diff --git a/plugins/woocommerce-blocks/src/Registry/SharedType.php b/plugins/woocommerce-blocks/src/Registry/SharedType.php
index 3c4c0dc6c68..2b56e4dd620 100644
--- a/plugins/woocommerce-blocks/src/Registry/SharedType.php
+++ b/plugins/woocommerce-blocks/src/Registry/SharedType.php
@@ -1,10 +1,4 @@
 <?php
-/**
- * Holds the SharedType class definition
- *
- * @package WooCommerce\Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\Registry;
 
 /**
diff --git a/plugins/woocommerce-blocks/src/RestApi.php b/plugins/woocommerce-blocks/src/RestApi.php
index ee612e99586..d03d5ed560c 100644
--- a/plugins/woocommerce-blocks/src/RestApi.php
+++ b/plugins/woocommerce-blocks/src/RestApi.php
@@ -1,19 +1,14 @@
 <?php
-/**
- * Registers controllers in the blocks REST API namespace.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\RoutesController;
 use Automattic\WooCommerce\Blocks\StoreApi\SchemaController;
 
 /**
  * RestApi class.
+ * Registers controllers in the blocks REST API namespace.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class RestApi {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/AbstractCartRoute.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/AbstractCartRoute.php
index 4cc03b92ef7..272656dedc7 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/AbstractCartRoute.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/AbstractCartRoute.php
@@ -1,18 +1,12 @@
 <?php
-/**
- * Abstract Cart route.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController;
 
 /**
- * Cart class.
+ * Abstract Cart Route
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 abstract class AbstractCartRoute extends AbstractRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/AbstractRoute.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/AbstractRoute.php
index 7834cb75dfa..76308ae0bfe 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/AbstractRoute.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/AbstractRoute.php
@@ -1,19 +1,12 @@
 <?php
-/**
- * Abstract route.
- *
- * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Schemas\AbstractSchema;
 
 /**
  * AbstractRoute class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 abstract class AbstractRoute implements RouteInterface {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/AbstractTermsRoute.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/AbstractTermsRoute.php
index 3f1a3e20526..1c6711b0adb 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/AbstractTermsRoute.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/AbstractTermsRoute.php
@@ -1,20 +1,13 @@
 <?php
-/**
- * Abstract Terms route.
- *
- * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\Pagination;
 use WP_Term_Query;
 
 /**
  * AbstractTermsRoute class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 abstract class AbstractTermsRoute extends AbstractRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/Cart.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/Cart.php
index 64d851780ca..63081897474 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/Cart.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/Cart.php
@@ -1,18 +1,12 @@
 <?php
-/**
- * Cart route.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController;
 
 /**
  * Cart class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class Cart extends AbstractCartRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartAddItem.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartAddItem.php
index b06f04c3b72..146c38b48e1 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartAddItem.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartAddItem.php
@@ -1,18 +1,12 @@
 <?php
-/**
- * Cart add item route.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController;
 
 /**
  * CartAddItem class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class CartAddItem extends AbstractCartRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartApplyCoupon.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartApplyCoupon.php
index 4bcb7b91dd4..4b87913a7ad 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartApplyCoupon.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartApplyCoupon.php
@@ -1,18 +1,12 @@
 <?php
-/**
- * Cart apply coupon route.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController;
 
 /**
  * CartApplyCoupon class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class CartApplyCoupon extends AbstractCartRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartCoupons.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartCoupons.php
index 2884250eb0b..23cd92217ac 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartCoupons.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartCoupons.php
@@ -1,19 +1,12 @@
 <?php
-/**
- * Cart Coupons route.
- *
- * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController;
 
 /**
  * CartCoupons class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class CartCoupons extends AbstractRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartCouponsByCode.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartCouponsByCode.php
index 3078ab4c8fb..ba4a1b6b4e4 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartCouponsByCode.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartCouponsByCode.php
@@ -1,19 +1,12 @@
 <?php
-/**
- * Cart Coupons route.
- *
- * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController;
 
 /**
  * CartCouponsByCode class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class CartCouponsByCode extends AbstractRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartItems.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartItems.php
index 846fcc0c2f7..d2c565a4937 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartItems.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartItems.php
@@ -1,19 +1,12 @@
 <?php
-/**
- * Cart items route.
- *
- * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController;
 
 /**
  * CartItems class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class CartItems extends AbstractRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartItemsByKey.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartItemsByKey.php
index 3eeca6e53ff..acbbb5ba679 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartItemsByKey.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartItemsByKey.php
@@ -1,19 +1,12 @@
 <?php
-/**
- * Cart item route.
- *
- * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController;
 
 /**
  * CartItemsByKey class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class CartItemsByKey extends AbstractRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartRemoveCoupon.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartRemoveCoupon.php
index 5466b3bedb8..e87b64cd453 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartRemoveCoupon.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartRemoveCoupon.php
@@ -1,18 +1,12 @@
 <?php
-/**
- * Cart remove coupon route.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController;
 
 /**
  * CartRemoveCoupon class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class CartRemoveCoupon extends AbstractCartRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartRemoveItem.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartRemoveItem.php
index 4ea46fca5a1..74a4702cbab 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartRemoveItem.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartRemoveItem.php
@@ -1,18 +1,12 @@
 <?php
-/**
- * Cart remove item route.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController;
 
 /**
  * CartRemoveItem class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class CartRemoveItem extends AbstractCartRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartSelectShippingRate.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartSelectShippingRate.php
index c3c10fc278b..bff79f34fa5 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartSelectShippingRate.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartSelectShippingRate.php
@@ -1,18 +1,12 @@
 <?php
-/**
- * Cart select shipping rate route.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController;
 
 /**
  * CartSelectShippingRate class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class CartSelectShippingRate extends AbstractCartRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartUpdateItem.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartUpdateItem.php
index 07a5a541537..6db04b07a9c 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartUpdateItem.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartUpdateItem.php
@@ -1,18 +1,12 @@
 <?php
-/**
- * Cart update item route.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController;
 
 /**
  * CartUpdateItem class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class CartUpdateItem extends AbstractCartRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartUpdateShipping.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartUpdateShipping.php
index f618751eb72..82cfaf169fb 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/CartUpdateShipping.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/CartUpdateShipping.php
@@ -1,18 +1,12 @@
 <?php
-/**
- * Cart update shipping route.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController;
 
 /**
  * CartUpdateShipping class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class CartUpdateShipping extends AbstractCartRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/Checkout.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/Checkout.php
index c827ca1ecdb..6683526b6af 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/Checkout.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/Checkout.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Checkout route.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController;
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\OrderController;
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\ReserveStock;
@@ -18,6 +10,8 @@ use Automattic\WooCommerce\Blocks\Payments\PaymentContext;
 
 /**
  * Checkout class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class Checkout extends AbstractRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributeTerms.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributeTerms.php
index 0e416a59452..b4f4e861737 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributeTerms.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributeTerms.php
@@ -1,17 +1,10 @@
 <?php
-/**
- * Product Attribute Terms route.
- *
- * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductAttributeTerms class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class ProductAttributeTerms extends AbstractTermsRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributes.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributes.php
index 123503ae5f4..b7e14eab696 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributes.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributes.php
@@ -1,17 +1,10 @@
 <?php
-/**
- * Product Attributes route.
- *
- * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductAttributes class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class ProductAttributes extends AbstractRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributesById.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributesById.php
index 01f2ca7c32d..4d20634ff14 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributesById.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductAttributesById.php
@@ -1,17 +1,10 @@
 <?php
-/**
- * Product Attributes route.
- *
- * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductAttributesById class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class ProductAttributesById extends AbstractRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductCategories.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductCategories.php
index 1f9e2b453d0..3161d278850 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductCategories.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductCategories.php
@@ -1,17 +1,10 @@
 <?php
-/**
- * Product Categories route.
- *
- * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductCategories class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class ProductCategories extends AbstractTermsRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductCategoriesById.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductCategoriesById.php
index ab34c9a7929..809cd7ac24f 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductCategoriesById.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductCategoriesById.php
@@ -1,17 +1,10 @@
 <?php
-/**
- * Product Category route.
- *
- * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductCategoriesById class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class ProductCategoriesById extends AbstractRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductCollectionData.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductCollectionData.php
index 7ed9de80bf2..6672b8ddc6b 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductCollectionData.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductCollectionData.php
@@ -1,21 +1,15 @@
 <?php
-/**
- * Products collection data route. Get aggregate data from a collection of products.
- *
- * Supports the same parameters as /products, but returns a different response.
- *
- * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\ProductQueryFilters;
 
 /**
  * ProductCollectionData route.
+ * Get aggregate data from a collection of products.
+ *
+ * Supports the same parameters as /products, but returns a different response.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class ProductCollectionData extends AbstractRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductReviews.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductReviews.php
index 3f0dd899aaa..8b936ff5e6b 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductReviews.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductReviews.php
@@ -1,20 +1,13 @@
 <?php
-/**
- * Product Reviews route.
- *
- * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use WP_Comment_Query;
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\Pagination;
 
 /**
  * ProductReviews class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class ProductReviews extends AbstractRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductTags.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductTags.php
index 9e674965fbc..b0b09535bcd 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductTags.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductTags.php
@@ -1,17 +1,10 @@
 <?php
-/**
- * Product Tags route.
- *
- * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductTags class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class ProductTags extends AbstractTermsRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/Products.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/Products.php
index 6259d9acaa7..fcc42df6e7c 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/Products.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/Products.php
@@ -1,20 +1,13 @@
 <?php
-/**
- * Products route.
- *
- * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\Pagination;
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\ProductQuery;
 
 /**
  * Products class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class Products extends AbstractRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductsById.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductsById.php
index 921138d55d5..f84305acfdb 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductsById.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/ProductsById.php
@@ -1,17 +1,10 @@
 <?php
-/**
- * Products route.
- *
- * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductsById class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class ProductsById extends AbstractRoute {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/RouteException.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/RouteException.php
index dff98cb6b36..9f7fd78d0d9 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/RouteException.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/RouteException.php
@@ -1,14 +1,10 @@
 <?php
-/**
- * Exceptions for rest routes.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
 /**
  * ReserveStockRouteExceptionException class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class RouteException extends \Exception {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Routes/RouteInterface.php b/plugins/woocommerce-blocks/src/StoreApi/Routes/RouteInterface.php
index 4330958392b..66711f79537 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Routes/RouteInterface.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Routes/RouteInterface.php
@@ -1,16 +1,10 @@
 <?php
-/**
- * Route interface.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Routes;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * RouteInterface.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 interface RouteInterface {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/RoutesController.php b/plugins/woocommerce-blocks/src/StoreApi/RoutesController.php
index 4fe693d3c34..58414d140a2 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/RoutesController.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/RoutesController.php
@@ -1,19 +1,12 @@
 <?php
-/**
- * Register Routes.
- *
- * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi;
 
-defined( 'ABSPATH' ) || exit;
-
 use Routes\AbstractRoute;
 
 /**
  * RoutesController class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class RoutesController {
 
diff --git a/plugins/woocommerce-blocks/src/StoreApi/SchemaController.php b/plugins/woocommerce-blocks/src/StoreApi/SchemaController.php
index 72f99f11563..ff4d38f6108 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/SchemaController.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/SchemaController.php
@@ -1,20 +1,13 @@
 <?php
-/**
- * Register Schemas.
- *
- * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi;
 
-defined( 'ABSPATH' ) || exit;
-
 use Exception;
 use Schemas\AbstractSchema;
 
 /**
  * SchemaController class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class SchemaController {
 
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/AbstractSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/AbstractSchema.php
index 43aaead283e..a5ad5ad4e64 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/AbstractSchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/AbstractSchema.php
@@ -1,19 +1,12 @@
 <?php
-/**
- * Abstract Schema.
- *
- * Rest API schema class.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
- * AbstractBlock class.
+ * AbstractSchema class.
  *
+ * For REST Route Schemas
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  * @since 2.5.0
  */
 abstract class AbstractSchema {
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/BillingAddressSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/BillingAddressSchema.php
index c7f61948637..64712c9febd 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/BillingAddressSchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/BillingAddressSchema.php
@@ -1,20 +1,14 @@
 <?php
-/**
- * Billing Address Schema.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\RestApi\Routes;
 
 /**
  * BillingAddressSchema class.
  *
  * Provides a generic billing address schema for composition in other schemas.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class BillingAddressSchema extends AbstractSchema {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartCouponSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartCouponSchema.php
index ca4f5cd82a1..63ac2936ffd 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartCouponSchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartCouponSchema.php
@@ -1,19 +1,12 @@
 <?php
-/**
- * Cart Coupon Schema.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController;
 
 /**
  * CartCouponSchema class.
  *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  * @since 2.5.0
  */
 class CartCouponSchema extends AbstractSchema {
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartItemSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartItemSchema.php
index c97d82618cc..e98937bbd44 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartItemSchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartItemSchema.php
@@ -1,17 +1,10 @@
 <?php
-/**
- * Cart Item Schema.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * CartItemSchema class.
  *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  * @since 2.5.0
  */
 class CartItemSchema extends ProductSchema {
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartSchema.php
index 779ce55798a..6a5528e972c 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartSchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartSchema.php
@@ -1,19 +1,12 @@
 <?php
-/**
- * Cart schema.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas;
 
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\CartController;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * CartSchema class.
  *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  * @since 2.5.0
  */
 class CartSchema extends AbstractSchema {
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartShippingRateSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartShippingRateSchema.php
index feeb3eb45e4..4e2c9c71e7a 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartShippingRateSchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CartShippingRateSchema.php
@@ -1,18 +1,12 @@
 <?php
-/**
- * Cart shipping rate schema.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas;
 
-defined( 'ABSPATH' ) || exit;
-
 use WC_Shipping_Rate as ShippingRate;
 
 /**
  * CartShippingRateSchema class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class CartShippingRateSchema extends AbstractSchema {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/CheckoutSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CheckoutSchema.php
index 71a8412c105..7b59362e703 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/CheckoutSchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/CheckoutSchema.php
@@ -1,18 +1,12 @@
 <?php
-/**
- * Checkout schema for the Store API.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\Payments\PaymentResult;
 
 /**
  * CheckoutSchema class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class CheckoutSchema extends AbstractSchema {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/ErrorSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ErrorSchema.php
index b778396b1af..832ecdfc754 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/ErrorSchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ErrorSchema.php
@@ -1,17 +1,10 @@
 <?php
-/**
- * Error Schema.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ErrorSchema class.
  *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  * @since 2.5.0
  */
 class ErrorSchema extends AbstractSchema {
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/ImageAttachmentSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ImageAttachmentSchema.php
index 687281ca516..4d69faaaf50 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/ImageAttachmentSchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ImageAttachmentSchema.php
@@ -1,16 +1,10 @@
 <?php
-/**
- * Image Attachment Schema.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ImageAttachmentSchema class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class ImageAttachmentSchema extends AbstractSchema {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/OrderCouponSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/OrderCouponSchema.php
index b332b9c64ea..d9346a0ab01 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/OrderCouponSchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/OrderCouponSchema.php
@@ -1,16 +1,10 @@
 <?php
-/**
- * Order Coupon Schema.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * OrderCouponSchema class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class OrderCouponSchema extends AbstractSchema {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductAttributeSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductAttributeSchema.php
index 929e5fa464c..85d2dc682e1 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductAttributeSchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductAttributeSchema.php
@@ -1,17 +1,10 @@
 <?php
-/**
- * Product Attribute Schema.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductAttributeSchema class.
  *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  * @since 2.5.0
  */
 class ProductAttributeSchema extends AbstractSchema {
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductCategorySchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductCategorySchema.php
index 49e6021e09e..5bd746a0a9d 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductCategorySchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductCategorySchema.php
@@ -1,16 +1,10 @@
 <?php
-/**
- * Product Category Schema.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductCategorySchema class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class ProductCategorySchema extends TermSchema {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductCollectionDataSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductCollectionDataSchema.php
index a4d600f769f..ed26199791c 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductCollectionDataSchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductCollectionDataSchema.php
@@ -1,17 +1,10 @@
 <?php
-/**
- * Product Collection Data Schema.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductCollectionDataSchema class.
  *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  * @since 2.5.0
  */
 class ProductCollectionDataSchema extends AbstractSchema {
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductReviewSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductReviewSchema.php
index 70023d78fe7..1ab95d504e2 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductReviewSchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductReviewSchema.php
@@ -1,16 +1,10 @@
 <?php
-/**
- * Product Review Schema.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductReviewSchema class.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class ProductReviewSchema extends AbstractSchema {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductSchema.php
index fe8eca5848a..2f84a1c7bdb 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductSchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ProductSchema.php
@@ -1,17 +1,10 @@
 <?php
-/**
- * Product Schema.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * ProductSchema class.
  *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  * @since 2.5.0
  */
 class ProductSchema extends AbstractSchema {
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/ShippingAddressSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ShippingAddressSchema.php
index 9fb3fa70319..cbdee75b691 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/ShippingAddressSchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/ShippingAddressSchema.php
@@ -1,14 +1,6 @@
 <?php
-/**
- * Shipping Address Schema.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\RestApi\Routes;
 
 /**
@@ -16,6 +8,7 @@ use Automattic\WooCommerce\Blocks\RestApi\Routes;
  *
  * Provides a generic shipping address schema for composition in other schemas.
  *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  * @since 2.5.0
  */
 class ShippingAddressSchema extends AbstractSchema {
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Schemas/TermSchema.php b/plugins/woocommerce-blocks/src/StoreApi/Schemas/TermSchema.php
index c016bd87b52..d0f880b940c 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Schemas/TermSchema.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Schemas/TermSchema.php
@@ -1,17 +1,10 @@
 <?php
-/**
- * Term Schema.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Schemas;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * TermSchema class.
  *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  * @since 2.5.0
  */
 class TermSchema extends AbstractSchema {
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Utilities/CartController.php b/plugins/woocommerce-blocks/src/StoreApi/Utilities/CartController.php
index 2616debd681..6afb92709cf 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Utilities/CartController.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Utilities/CartController.php
@@ -1,20 +1,14 @@
 <?php
-/**
- * Helper class to bridge the gap between the cart API and Woo core.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Utilities;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Routes\RouteException;
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\NoticeHandler;
 
 /**
  * Woo Cart Controller class.
+ * Helper class to bridge the gap between the cart API and Woo core.
  *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  * @since 2.5.0
  */
 class CartController {
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Utilities/NoticeHandler.php b/plugins/woocommerce-blocks/src/StoreApi/Utilities/NoticeHandler.php
index 003de3880d7..2f6ddc96173 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Utilities/NoticeHandler.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Utilities/NoticeHandler.php
@@ -1,18 +1,13 @@
 <?php
-/**
- * Helper class to convert notices to exceptions.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Utilities;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Routes\RouteException;
 
 /**
  * NoticeHandler class.
+ * Helper class to convert notices to exceptions.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class NoticeHandler {
 
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Utilities/OrderController.php b/plugins/woocommerce-blocks/src/StoreApi/Utilities/OrderController.php
index bcc485685ab..2329d91dde8 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Utilities/OrderController.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Utilities/OrderController.php
@@ -1,18 +1,13 @@
 <?php
-/**
- * Helper class which creates and syncs orders with the cart.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Utilities;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Routes\RouteException;
 
 /**
  * OrderController class.
+ * Helper class which creates and syncs orders with the cart.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class OrderController {
 
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Utilities/Pagination.php b/plugins/woocommerce-blocks/src/StoreApi/Utilities/Pagination.php
index 20cc01d82dc..ccb8f4a3f62 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Utilities/Pagination.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Utilities/Pagination.php
@@ -1,17 +1,10 @@
 <?php
-/**
- * Pagination helper.
- *
- * @package Automattic/WooCommerce/RestApi
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Utilities;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * Pagination class.
  *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  * @since 2.5.0
  */
 class Pagination {
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Utilities/ProductQuery.php b/plugins/woocommerce-blocks/src/StoreApi/Utilities/ProductQuery.php
index 37235c116f5..74970eac07f 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Utilities/ProductQuery.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Utilities/ProductQuery.php
@@ -1,19 +1,13 @@
 <?php
-/**
- * Helper class to handle product queries for the API.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Utilities;
 
-defined( 'ABSPATH' ) || exit;
-
 use WC_Tax;
 
 /**
  * Product Query class.
+ * Helper class to handle product queries for the API.
  *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  * @since 2.5.0
  */
 class ProductQuery {
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Utilities/ProductQueryFilters.php b/plugins/woocommerce-blocks/src/StoreApi/Utilities/ProductQueryFilters.php
index df8e83648d9..d8ebb7655be 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Utilities/ProductQueryFilters.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Utilities/ProductQueryFilters.php
@@ -1,19 +1,12 @@
 <?php
-/**
- * Product Query filters helper.
- *
- * @package Automattic/WooCommerce/RestApi
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Utilities;
 
-defined( 'ABSPATH' ) || exit;
-
 use Automattic\WooCommerce\Blocks\StoreApi\Utilities\ProductQuery;
 
 /**
  * Product Query filters class.
  *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  * @since 2.5.0
  */
 class ProductQueryFilters {
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Utilities/ReserveStock.php b/plugins/woocommerce-blocks/src/StoreApi/Utilities/ReserveStock.php
index 2ca6f5f8b10..e856f9793bb 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Utilities/ReserveStock.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Utilities/ReserveStock.php
@@ -1,16 +1,11 @@
 <?php
-/**
- * Handle product stock reservation during checkout.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Utilities;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * Stock Reservation class.
+ * Handle product stock reservation during checkout.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 final class ReserveStock {
 	/**
diff --git a/plugins/woocommerce-blocks/src/StoreApi/Utilities/ReserveStockException.php b/plugins/woocommerce-blocks/src/StoreApi/Utilities/ReserveStockException.php
index 04a18cbfab1..19546fd54ef 100644
--- a/plugins/woocommerce-blocks/src/StoreApi/Utilities/ReserveStockException.php
+++ b/plugins/woocommerce-blocks/src/StoreApi/Utilities/ReserveStockException.php
@@ -1,14 +1,11 @@
 <?php
-/**
- * Exceptions for stock reservation.
- *
- * @package WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\StoreApi\Utilities;
 
 /**
  * ReserveStockException class.
+ * Exceptions for stock reservation.
+ *
+ * @internal This API is used internally by Blocks--it is still in flux and may be subject to revisions.
  */
 class ReserveStockException extends \Exception {
 	/**
diff --git a/plugins/woocommerce-blocks/src/Utils/BlocksWpQuery.php b/plugins/woocommerce-blocks/src/Utils/BlocksWpQuery.php
index cdc6ad04809..40992be068c 100644
--- a/plugins/woocommerce-blocks/src/Utils/BlocksWpQuery.php
+++ b/plugins/woocommerce-blocks/src/Utils/BlocksWpQuery.php
@@ -1,21 +1,14 @@
 <?php
-/**
- * Wrapper for WP Query with additonal helper methods.
- *
- * Allows query args to be set and parsed without doing running it, so that a cache can be used.
- *
- * @package Automattic/WooCommerce/Blocks
- */
-
 namespace Automattic\WooCommerce\Blocks\Utils;
 
 use WP_Query;
 
-defined( 'ABSPATH' ) || exit;
-
 /**
  * BlocksWpQuery query.
  *
+ * Wrapper for WP Query with additonal helper methods.
+ * Allows query args to be set and parsed without doing running it, so that a cache can be used.
+ *
  * @deprecated 2.5.0
  */
 class BlocksWpQuery extends WP_Query {
diff --git a/plugins/woocommerce-blocks/tests/php/Bootstrap/MainFile.php b/plugins/woocommerce-blocks/tests/php/Bootstrap/MainFile.php
index db18b1dea74..688bf6d8949 100644
--- a/plugins/woocommerce-blocks/tests/php/Bootstrap/MainFile.php
+++ b/plugins/woocommerce-blocks/tests/php/Bootstrap/MainFile.php
@@ -2,8 +2,6 @@
 /**
  *  Contains Tests for the main file (woocommerce-gutenberg-products-blocks.php)
  *  bootstrap.
- *
- *  @package WooCommerce\Blocks\Tests
  */
 
 namespace Automattic\WooCommerce\Blocks\Tests\Bootstrap;
diff --git a/plugins/woocommerce-blocks/tests/php/Helpers/TestValidateSchema.php b/plugins/woocommerce-blocks/tests/php/Helpers/TestValidateSchema.php
index fa7c91e26ad..eefb610a36e 100644
--- a/plugins/woocommerce-blocks/tests/php/Helpers/TestValidateSchema.php
+++ b/plugins/woocommerce-blocks/tests/php/Helpers/TestValidateSchema.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * Ensures the helper works.
- *
- * @package WooCommerce\Blocks\Tests
  */
 
 namespace Automattic\WooCommerce\Blocks\Tests\Helpers;
diff --git a/plugins/woocommerce-blocks/tests/php/Helpers/ValidateSchema.php b/plugins/woocommerce-blocks/tests/php/Helpers/ValidateSchema.php
index 00e20a4855c..cfe134994f0 100644
--- a/plugins/woocommerce-blocks/tests/php/Helpers/ValidateSchema.php
+++ b/plugins/woocommerce-blocks/tests/php/Helpers/ValidateSchema.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * Helper used to validate schema differences.
- *
- * @package WooCommerce\Blocks\Tests
  */
 
 namespace Automattic\WooCommerce\Blocks\Tests\Helpers;
diff --git a/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/Cart.php b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/Cart.php
index abf62ae4dab..a186160cd09 100644
--- a/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/Cart.php
+++ b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/Cart.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * Controller Tests.
- *
- * @package WooCommerce\Blocks\Tests
  */
 
 namespace Automattic\WooCommerce\Blocks\Tests\StoreApi\Controllers;
diff --git a/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/CartCoupons.php b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/CartCoupons.php
index 9d9df25bb20..33ded4374c0 100644
--- a/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/CartCoupons.php
+++ b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/CartCoupons.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * Controller Tests.
- *
- * @package WooCommerce\Blocks\Tests
  */
 
 namespace Automattic\WooCommerce\Blocks\Tests\StoreApi\Controllers;
diff --git a/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/CartItems.php b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/CartItems.php
index 1965914020d..553645874fc 100644
--- a/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/CartItems.php
+++ b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/CartItems.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * Controller Tests.
- *
- * @package WooCommerce\Blocks\Tests
  */
 
 namespace Automattic\WooCommerce\Blocks\Tests\StoreApi\Controllers;
diff --git a/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductAttributeTerms.php b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductAttributeTerms.php
index 805145871dd..dc7a1c86bfa 100644
--- a/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductAttributeTerms.php
+++ b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductAttributeTerms.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * Controller Tests.
- *
- * @package WooCommerce\Blocks\Tests
  */
 
 namespace Automattic\WooCommerce\Blocks\Tests\StoreApi\Controllers;
diff --git a/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductAttributes.php b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductAttributes.php
index 67d29e8efd6..9191c5443df 100644
--- a/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductAttributes.php
+++ b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductAttributes.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * Controller Tests.
- *
- * @package WooCommerce\Blocks\Tests
  */
 
 namespace Automattic\WooCommerce\Blocks\Tests\StoreApi\Controllers;
diff --git a/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductCollectionData.php b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductCollectionData.php
index d66c8af244b..eaf80989f6a 100644
--- a/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductCollectionData.php
+++ b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/ProductCollectionData.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * Controller Tests.
- *
- * @package WooCommerce\Blocks\Tests
  */
 
 namespace Automattic\WooCommerce\Blocks\Tests\StoreApi\Controllers;
diff --git a/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/Products.php b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/Products.php
index 57637d4f425..e20307a103b 100644
--- a/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/Products.php
+++ b/plugins/woocommerce-blocks/tests/php/StoreApi/Routes/Products.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * Controller Tests.
- *
- * @package WooCommerce\Blocks\Tests
  */
 
 namespace Automattic\WooCommerce\Blocks\Tests\StoreApi\Controllers;
diff --git a/plugins/woocommerce-blocks/tests/php/StoreApi/Utilities/ReserveStock.php b/plugins/woocommerce-blocks/tests/php/StoreApi/Utilities/ReserveStock.php
index 424a0a3bbc8..78aafb8f65c 100644
--- a/plugins/woocommerce-blocks/tests/php/StoreApi/Utilities/ReserveStock.php
+++ b/plugins/woocommerce-blocks/tests/php/StoreApi/Utilities/ReserveStock.php
@@ -1,8 +1,6 @@
 <?php
 /**
  * Utility Tests.
- *
- * @package WooCommerce\Blocks\Tests
  */
 
 namespace Automattic\WooCommerce\Blocks\Tests\StoreApi\Utilities;