From 789c540c8edb437ed06135d405d7773934b65299 Mon Sep 17 00:00:00 2001
From: tuna <ladiesman9x@gmail.com>
Date: Tue, 13 Apr 2021 22:45:59 +0700
Subject: [PATCH] Mark Framework interfaces as API part 2

Update


hollymolly


up


update


update types


fix fail tests


update strict type for preg_match 2rd argument


Update


revert origin code


resolve conflicts
---
 .../Magento/Framework/App/CsrfAwareActionInterface.php    | 3 ++-
 .../Magento/Framework/App/DefaultPathInterface.php        | 6 ++++--
 .../Framework/App/DeploymentConfig/ImporterInterface.php  | 4 ++++
 .../Framework/App/DeploymentConfig/ValidatorInterface.php | 4 ++++
 .../App/DeploymentConfig/Writer/FormatterInterface.php    | 2 ++
 lib/internal/Magento/Framework/App/DesignInterface.php    | 4 ++++
 .../Magento/Framework/App/EnvironmentInterface.php        | 3 +++
 .../Magento/Framework/App/ExceptionHandlerInterface.php   | 4 ++++
 .../Magento/Framework/App/FeedFactoryInterface.php        | 4 +++-
 lib/internal/Magento/Framework/App/FeedInterface.php      | 4 +++-
 .../Magento/Framework/App/HttpRequestInterface.php        | 5 +++++
 .../Framework/App/ObjectManager/ConfigWriterInterface.php | 3 ++-
 .../Framework/App/PageCache/NotCacheableInterface.php     | 5 +++--
 lib/internal/Magento/Framework/App/Request/Http.php       | 6 +++++-
 .../Framework/App/Request/InvalidRequestException.php     | 3 ++-
 .../Magento/Framework/App/Request/ValidatorInterface.php  | 3 ++-
 .../Framework/App/ResourceConnection/ConfigInterface.php  | 5 +++--
 .../App/ResourceConnection/ConnectionAdapterInterface.php | 3 +++
 .../Magento/Framework/App/Response/FileInterface.php      | 5 +++--
 .../Response/HeaderProvider/HeaderProviderInterface.php   | 2 ++
 lib/internal/Magento/Framework/App/Response/Http.php      | 1 +
 .../Magento/Framework/App/Response/RedirectInterface.php  | 5 +++--
 .../Framework/App/Router/NoRouteHandlerInterface.php      | 3 +++
 .../Magento/Framework/App/Router/PathConfigInterface.php  | 3 +++
 lib/internal/Magento/Framework/App/RouterInterface.php    | 8 +++++---
 .../Magento/Framework/App/RouterListInterface.php         | 6 +++++-
 .../Magento/Framework/App/Rss/RssManagerInterface.php     | 5 ++++-
 .../Magento/Framework/App/Rss/UrlBuilderInterface.php     | 5 ++++-
 .../Magento/Framework/App/Scope/ValidatorInterface.php    | 4 ++++
 .../Framework/App/ScopeFallbackResolverInterface.php      | 3 +++
 .../Magento/Framework/App/ScopeResolverInterface.php      | 6 +++++-
 .../Magento/Framework/App/ScopeTreeProviderInterface.php  | 3 +++
 .../Magento/Framework/App/ScopeValidatorInterface.php     | 3 +++
 .../Asset/MaterializationStrategy/StrategyInterface.php   | 2 ++
 .../App/View/Deployment/Version/StorageInterface.php      | 3 +++
 lib/internal/Magento/Framework/DB/LoggerInterface.php     | 4 ++++
 .../Magento/Framework/Interception/ConfigInterface.php    | 6 ++++--
 .../Interception/ObjectManager/ConfigInterface.php        | 3 +++
 .../Framework/ObjectManager/ConfigCacheInterface.php      | 3 +++
 .../Magento/Framework/ObjectManager/ConfigInterface.php   | 3 +++
 .../Framework/ObjectManager/RelationsInterface.php        | 3 +++
 lib/internal/Magento/Framework/View/DesignInterface.php   | 6 +++++-
 42 files changed, 139 insertions(+), 27 deletions(-)

diff --git a/lib/internal/Magento/Framework/App/CsrfAwareActionInterface.php b/lib/internal/Magento/Framework/App/CsrfAwareActionInterface.php
index 8413b945a1141..709e2f3292504 100644
--- a/lib/internal/Magento/Framework/App/CsrfAwareActionInterface.php
+++ b/lib/internal/Magento/Framework/App/CsrfAwareActionInterface.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Framework\App;
@@ -12,6 +11,8 @@
 
 /**
  * Action that's aware of CSRF protection.
+ *
+ * @api
  */
 interface CsrfAwareActionInterface extends ActionInterface
 {
diff --git a/lib/internal/Magento/Framework/App/DefaultPathInterface.php b/lib/internal/Magento/Framework/App/DefaultPathInterface.php
index a0a517815e3e0..9e3af47c2b1d4 100644
--- a/lib/internal/Magento/Framework/App/DefaultPathInterface.php
+++ b/lib/internal/Magento/Framework/App/DefaultPathInterface.php
@@ -1,15 +1,17 @@
 <?php
 /**
- * Abstract application router
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App;
 
 /**
  * Interface \Magento\Framework\App\DefaultPathInterface
+ * Abstract application router
  *
+ * @api
  */
 interface DefaultPathInterface
 {
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/ImporterInterface.php b/lib/internal/Magento/Framework/App/DeploymentConfig/ImporterInterface.php
index 5a6e287881d31..8e5b1580047bf 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig/ImporterInterface.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig/ImporterInterface.php
@@ -3,12 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\DeploymentConfig;
 
 use Magento\Framework\Exception\State\InvalidTransitionException;
 
 /**
  * Interface for importers which import data from shared configuration files to appropriate data storage.
+ *
+ * @api
  */
 interface ImporterInterface
 {
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/ValidatorInterface.php b/lib/internal/Magento/Framework/App/DeploymentConfig/ValidatorInterface.php
index aaa31f018320a..504fca3a5753a 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig/ValidatorInterface.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig/ValidatorInterface.php
@@ -3,10 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\DeploymentConfig;
 
 /**
  * Validator interface for section data from shared configuration files.
+ *
+ * @api
  */
 interface ValidatorInterface
 {
diff --git a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/FormatterInterface.php b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/FormatterInterface.php
index 9425fd9a4a925..a794a7cf7295e 100644
--- a/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/FormatterInterface.php
+++ b/lib/internal/Magento/Framework/App/DeploymentConfig/Writer/FormatterInterface.php
@@ -3,12 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\App\DeploymentConfig\Writer;
 
 /**
  * Interface \Magento\Framework\App\DeploymentConfig\Writer\FormatterInterface
  *
+ * @api
  */
 interface FormatterInterface
 {
diff --git a/lib/internal/Magento/Framework/App/DesignInterface.php b/lib/internal/Magento/Framework/App/DesignInterface.php
index 75ef7253a3dd7..e0dc8931aedb9 100644
--- a/lib/internal/Magento/Framework/App/DesignInterface.php
+++ b/lib/internal/Magento/Framework/App/DesignInterface.php
@@ -3,10 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App;
 
 /**
  * Design Interface
+ *
+ * @api
  */
 interface DesignInterface
 {
diff --git a/lib/internal/Magento/Framework/App/EnvironmentInterface.php b/lib/internal/Magento/Framework/App/EnvironmentInterface.php
index ef0394c49aed4..3d4c7612e3627 100644
--- a/lib/internal/Magento/Framework/App/EnvironmentInterface.php
+++ b/lib/internal/Magento/Framework/App/EnvironmentInterface.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\App;
 
@@ -12,6 +13,8 @@
 
 /**
  * Interface for ObjectManager Environment
+ *
+ * @api
  */
 interface EnvironmentInterface
 {
diff --git a/lib/internal/Magento/Framework/App/ExceptionHandlerInterface.php b/lib/internal/Magento/Framework/App/ExceptionHandlerInterface.php
index b4bb5d555017d..f998cb8b1c39f 100644
--- a/lib/internal/Magento/Framework/App/ExceptionHandlerInterface.php
+++ b/lib/internal/Magento/Framework/App/ExceptionHandlerInterface.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App;
 
 use Magento\Framework\App\Response\Http as ResponseHttp;
@@ -10,6 +12,8 @@
 
 /**
  * Interface ExceptionHandler
+ *
+ * @api
  */
 interface ExceptionHandlerInterface
 {
diff --git a/lib/internal/Magento/Framework/App/FeedFactoryInterface.php b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php
index ac53a366bd127..0be4d994eb2a8 100644
--- a/lib/internal/Magento/Framework/App/FeedFactoryInterface.php
+++ b/lib/internal/Magento/Framework/App/FeedFactoryInterface.php
@@ -9,6 +9,8 @@
 
 /**
  * Feed factory interface
+ *
+ * @api
  */
 interface FeedFactoryInterface
 {
@@ -26,5 +28,5 @@ interface FeedFactoryInterface
      * @param string $format
      * @return FeedInterface
      */
-    public function create(array $data, string $format = self::FORMAT_RSS) : FeedInterface;
+    public function create(array $data, string $format = self::FORMAT_RSS): FeedInterface;
 }
diff --git a/lib/internal/Magento/Framework/App/FeedInterface.php b/lib/internal/Magento/Framework/App/FeedInterface.php
index 7d6346e107cfd..da40f6f294db5 100644
--- a/lib/internal/Magento/Framework/App/FeedInterface.php
+++ b/lib/internal/Magento/Framework/App/FeedInterface.php
@@ -9,6 +9,8 @@
 
 /**
  * Feed interface
+ *
+ * @api
  */
 interface FeedInterface
 {
@@ -17,5 +19,5 @@ interface FeedInterface
      *
      * @return string
      */
-    public function getFormattedContent() : string;
+    public function getFormattedContent(): string;
 }
diff --git a/lib/internal/Magento/Framework/App/HttpRequestInterface.php b/lib/internal/Magento/Framework/App/HttpRequestInterface.php
index 674ccdb07f49f..63a4f8090f2a8 100644
--- a/lib/internal/Magento/Framework/App/HttpRequestInterface.php
+++ b/lib/internal/Magento/Framework/App/HttpRequestInterface.php
@@ -7,6 +7,11 @@
 
 namespace Magento\Framework\App;
 
+/**
+ * Http Request interface
+ *
+ * @api
+ */
 interface HttpRequestInterface
 {
     /**
diff --git a/lib/internal/Magento/Framework/App/ObjectManager/ConfigWriterInterface.php b/lib/internal/Magento/Framework/App/ObjectManager/ConfigWriterInterface.php
index cccbb0ae30b99..221f354456256 100644
--- a/lib/internal/Magento/Framework/App/ObjectManager/ConfigWriterInterface.php
+++ b/lib/internal/Magento/Framework/App/ObjectManager/ConfigWriterInterface.php
@@ -3,13 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Framework\App\ObjectManager;
 
 /**
  * Write compiled object manager configuration to storage
+ *
+ * @api
  */
 interface ConfigWriterInterface
 {
diff --git a/lib/internal/Magento/Framework/App/PageCache/NotCacheableInterface.php b/lib/internal/Magento/Framework/App/PageCache/NotCacheableInterface.php
index f80914ec5cc1d..aede802adf23a 100644
--- a/lib/internal/Magento/Framework/App/PageCache/NotCacheableInterface.php
+++ b/lib/internal/Magento/Framework/App/PageCache/NotCacheableInterface.php
@@ -1,15 +1,16 @@
 <?php
 /**
- * HTTP response interface
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\PageCache;
 
 /**
  * Interface \Magento\Framework\App\PageCache\NotCacheableInterface
  *
+ * @api
  */
 interface NotCacheableInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Request/Http.php b/lib/internal/Magento/Framework/App/Request/Http.php
index 961e871fbfa91..1f6423cf771a5 100644
--- a/lib/internal/Magento/Framework/App/Request/Http.php
+++ b/lib/internal/Magento/Framework/App/Request/Http.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\Request;
 
 use Magento\Framework\App\HttpRequestInterface;
@@ -16,6 +18,8 @@
 
 /**
  * Http request
+ *
+ * @api
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Http extends Request implements RequestContentInterface, RequestSafetyInterface, HttpRequestInterface
@@ -255,7 +259,7 @@ public function setControllerModule($module)
     /**
      * Get module name of currently used controller
      *
-     * @return  string
+     * @return string
      */
     public function getControllerModule()
     {
diff --git a/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php b/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php
index e15a5151942f0..0f57fb08f30a3 100644
--- a/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php
+++ b/lib/internal/Magento/Framework/App/Request/InvalidRequestException.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Framework\App\Request;
@@ -16,6 +15,8 @@
 
 /**
  * Received request is invalid.
+ *
+ * @api
  */
 class InvalidRequestException extends RuntimeException
 {
diff --git a/lib/internal/Magento/Framework/App/Request/ValidatorInterface.php b/lib/internal/Magento/Framework/App/Request/ValidatorInterface.php
index f4b1503ac5cb6..f694e75c92c02 100644
--- a/lib/internal/Magento/Framework/App/Request/ValidatorInterface.php
+++ b/lib/internal/Magento/Framework/App/Request/ValidatorInterface.php
@@ -3,7 +3,6 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
-
 declare(strict_types=1);
 
 namespace Magento\Framework\App\Request;
@@ -13,6 +12,8 @@
 
 /**
  * Validate interface before giving passing it to an ActionInterface.
+ *
+ * @api
  */
 interface ValidatorInterface
 {
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection/ConfigInterface.php b/lib/internal/Magento/Framework/App/ResourceConnection/ConfigInterface.php
index 250aa02b56334..b9dfb27c06ebf 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection/ConfigInterface.php
@@ -1,15 +1,16 @@
 <?php
 /**
- * Resource configuration interface
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\ResourceConnection;
 
 /**
  * Interface \Magento\Framework\App\ResourceConnection\ConfigInterface
  *
+ * @api
  */
 interface ConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/App/ResourceConnection/ConnectionAdapterInterface.php b/lib/internal/Magento/Framework/App/ResourceConnection/ConnectionAdapterInterface.php
index 353f33a723abe..d65e1a6dc5b33 100644
--- a/lib/internal/Magento/Framework/App/ResourceConnection/ConnectionAdapterInterface.php
+++ b/lib/internal/Magento/Framework/App/ResourceConnection/ConnectionAdapterInterface.php
@@ -3,6 +3,8 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\ResourceConnection;
 
 use Magento\Framework\DB\Adapter\AdapterInterface;
@@ -12,6 +14,7 @@
 /**
  * Connection adapter interface
  *
+ * @api
  */
 interface ConnectionAdapterInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Response/FileInterface.php b/lib/internal/Magento/Framework/App/Response/FileInterface.php
index 421749ca85e03..2d4783d08781a 100644
--- a/lib/internal/Magento/Framework/App/Response/FileInterface.php
+++ b/lib/internal/Magento/Framework/App/Response/FileInterface.php
@@ -1,15 +1,16 @@
 <?php
 /**
- * Interface of response sending file content
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\Response;
 
 /**
  * Interface \Magento\Framework\App\Response\FileInterface
  *
+ * @api
  */
 interface FileInterface extends HttpInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Response/HeaderProvider/HeaderProviderInterface.php b/lib/internal/Magento/Framework/App/Response/HeaderProvider/HeaderProviderInterface.php
index a9fd2217dcd9b..82c347d56c409 100644
--- a/lib/internal/Magento/Framework/App/Response/HeaderProvider/HeaderProviderInterface.php
+++ b/lib/internal/Magento/Framework/App/Response/HeaderProvider/HeaderProviderInterface.php
@@ -3,12 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\App\Response\HeaderProvider;
 
 /**
  * Interface \Magento\Framework\App\Response\HeaderProvider\HeaderProviderInterface
  *
+ * @api
  */
 interface HeaderProviderInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Response/Http.php b/lib/internal/Magento/Framework/App/Response/Http.php
index dbe745b6fb239..724e9180e472c 100644
--- a/lib/internal/Magento/Framework/App/Response/Http.php
+++ b/lib/internal/Magento/Framework/App/Response/Http.php
@@ -18,6 +18,7 @@
 /**
  * HTTP Response.
  *
+ * @api
  * @SuppressWarnings(PHPMD.CookieAndSessionMisuse)
  */
 class Http extends \Magento\Framework\HTTP\PhpEnvironment\Response
diff --git a/lib/internal/Magento/Framework/App/Response/RedirectInterface.php b/lib/internal/Magento/Framework/App/Response/RedirectInterface.php
index 74a05761b5cbd..ad279beff8b05 100644
--- a/lib/internal/Magento/Framework/App/Response/RedirectInterface.php
+++ b/lib/internal/Magento/Framework/App/Response/RedirectInterface.php
@@ -1,15 +1,16 @@
 <?php
 /**
- * Response redirect interface
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\Response;
 
 /**
  * Interface \Magento\Framework\App\Response\RedirectInterface
  *
+ * @api
  */
 interface RedirectInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Router/NoRouteHandlerInterface.php b/lib/internal/Magento/Framework/App/Router/NoRouteHandlerInterface.php
index 6c86319a4fc53..4b6b4c50f0087 100644
--- a/lib/internal/Magento/Framework/App/Router/NoRouteHandlerInterface.php
+++ b/lib/internal/Magento/Framework/App/Router/NoRouteHandlerInterface.php
@@ -5,11 +5,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\Router;
 
 /**
  * Interface \Magento\Framework\App\Router\NoRouteHandlerInterface
  *
+ * @api
  */
 interface NoRouteHandlerInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Router/PathConfigInterface.php b/lib/internal/Magento/Framework/App/Router/PathConfigInterface.php
index a3c10d1c5492a..24ab627fa95f4 100644
--- a/lib/internal/Magento/Framework/App/Router/PathConfigInterface.php
+++ b/lib/internal/Magento/Framework/App/Router/PathConfigInterface.php
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\Router;
 
 /**
  * Interface \Magento\Framework\App\Router\PathConfigInterface
  *
+ * @api
  */
 interface PathConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/App/RouterInterface.php b/lib/internal/Magento/Framework/App/RouterInterface.php
index a029f1e3bc30c..08d8d3f4857ef 100644
--- a/lib/internal/Magento/Framework/App/RouterInterface.php
+++ b/lib/internal/Magento/Framework/App/RouterInterface.php
@@ -1,15 +1,17 @@
 <?php
-/**
- * Router. Matches action from request
- *
+/***
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App;
 
 /**
  * Interface \Magento\Framework\App\RouterInterface
+ * Router Matches action from request
  *
+ * @api
  */
 interface RouterInterface
 {
diff --git a/lib/internal/Magento/Framework/App/RouterListInterface.php b/lib/internal/Magento/Framework/App/RouterListInterface.php
index e491381362586..06c9ecd95bcde 100644
--- a/lib/internal/Magento/Framework/App/RouterListInterface.php
+++ b/lib/internal/Magento/Framework/App/RouterListInterface.php
@@ -3,10 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App;
 
 /**
- * Application router list
+ * Application router list interface
+ *
+ * @api
  */
 interface RouterListInterface extends \Iterator
 {
diff --git a/lib/internal/Magento/Framework/App/Rss/RssManagerInterface.php b/lib/internal/Magento/Framework/App/Rss/RssManagerInterface.php
index 4c7821c3aa583..38cabf1b46609 100644
--- a/lib/internal/Magento/Framework/App/Rss/RssManagerInterface.php
+++ b/lib/internal/Magento/Framework/App/Rss/RssManagerInterface.php
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\Rss;
 
 /**
  * Interface RssManagerInterface
- * @package Magento\Framework\App\Rss
+ *
+ * @api
  */
 interface RssManagerInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Rss/UrlBuilderInterface.php b/lib/internal/Magento/Framework/App/Rss/UrlBuilderInterface.php
index f7a2513f5fae9..cbac7fc83a827 100644
--- a/lib/internal/Magento/Framework/App/Rss/UrlBuilderInterface.php
+++ b/lib/internal/Magento/Framework/App/Rss/UrlBuilderInterface.php
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\Rss;
 
 /**
  * Interface UrlBuilderInterface
- * @package Magento\Framework\App\Rss
+ *
+ * @api
  */
 interface UrlBuilderInterface
 {
diff --git a/lib/internal/Magento/Framework/App/Scope/ValidatorInterface.php b/lib/internal/Magento/Framework/App/Scope/ValidatorInterface.php
index 93ec806366181..1f376597ee5a3 100644
--- a/lib/internal/Magento/Framework/App/Scope/ValidatorInterface.php
+++ b/lib/internal/Magento/Framework/App/Scope/ValidatorInterface.php
@@ -3,12 +3,16 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App\Scope;
 
 use Magento\Framework\Exception\LocalizedException;
 
 /**
  * Interface Validator for validating scope and scope code
+ *
+ * @api
  */
 interface ValidatorInterface
 {
diff --git a/lib/internal/Magento/Framework/App/ScopeFallbackResolverInterface.php b/lib/internal/Magento/Framework/App/ScopeFallbackResolverInterface.php
index a53457c89953d..6bafd8a24248e 100644
--- a/lib/internal/Magento/Framework/App/ScopeFallbackResolverInterface.php
+++ b/lib/internal/Magento/Framework/App/ScopeFallbackResolverInterface.php
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App;
 
 /**
  * Interface \Magento\Framework\App\ScopeFallbackResolverInterface
  *
+ * @api
  */
 interface ScopeFallbackResolverInterface
 {
diff --git a/lib/internal/Magento/Framework/App/ScopeResolverInterface.php b/lib/internal/Magento/Framework/App/ScopeResolverInterface.php
index bae89a6885d4f..94236603594f2 100644
--- a/lib/internal/Magento/Framework/App/ScopeResolverInterface.php
+++ b/lib/internal/Magento/Framework/App/ScopeResolverInterface.php
@@ -3,10 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App;
 
 /**
- * Scopes provider
+ * Scopes provider interface
+ *
+ * @api
  */
 interface ScopeResolverInterface
 {
diff --git a/lib/internal/Magento/Framework/App/ScopeTreeProviderInterface.php b/lib/internal/Magento/Framework/App/ScopeTreeProviderInterface.php
index a27007cf62cce..c9afa40808d1c 100644
--- a/lib/internal/Magento/Framework/App/ScopeTreeProviderInterface.php
+++ b/lib/internal/Magento/Framework/App/ScopeTreeProviderInterface.php
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App;
 
 /**
  * Interface \Magento\Framework\App\ScopeTreeProviderInterface
  *
+ * @api
  */
 interface ScopeTreeProviderInterface
 {
diff --git a/lib/internal/Magento/Framework/App/ScopeValidatorInterface.php b/lib/internal/Magento/Framework/App/ScopeValidatorInterface.php
index 645fd63d438bf..17e71293dd5c0 100644
--- a/lib/internal/Magento/Framework/App/ScopeValidatorInterface.php
+++ b/lib/internal/Magento/Framework/App/ScopeValidatorInterface.php
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\App;
 
 /**
  * Interface \Magento\Framework\App\ScopeValidatorInterface
  *
+ * @api
  */
 interface ScopeValidatorInterface
 {
diff --git a/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/StrategyInterface.php b/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/StrategyInterface.php
index 5dc00130cfe68..a64539a827d56 100644
--- a/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/StrategyInterface.php
+++ b/lib/internal/Magento/Framework/App/View/Asset/MaterializationStrategy/StrategyInterface.php
@@ -3,6 +3,7 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\App\View\Asset\MaterializationStrategy;
 
@@ -12,6 +13,7 @@
 /**
  * Interface \Magento\Framework\App\View\Asset\MaterializationStrategy\StrategyInterface
  *
+ * @api
  */
 interface StrategyInterface
 {
diff --git a/lib/internal/Magento/Framework/App/View/Deployment/Version/StorageInterface.php b/lib/internal/Magento/Framework/App/View/Deployment/Version/StorageInterface.php
index a80cf1c0e701c..0fcdf3d7de24d 100644
--- a/lib/internal/Magento/Framework/App/View/Deployment/Version/StorageInterface.php
+++ b/lib/internal/Magento/Framework/App/View/Deployment/Version/StorageInterface.php
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
 
 namespace Magento\Framework\App\View\Deployment\Version;
 
 /**
  * Persistence of deployment version of static files
+ *
+ * @api
  */
 interface StorageInterface
 {
diff --git a/lib/internal/Magento/Framework/DB/LoggerInterface.php b/lib/internal/Magento/Framework/DB/LoggerInterface.php
index f072254c0f76e..494b7f0678d45 100644
--- a/lib/internal/Magento/Framework/DB/LoggerInterface.php
+++ b/lib/internal/Magento/Framework/DB/LoggerInterface.php
@@ -3,10 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\DB;
 
 /**
  * DB logger interface
+ *
+ * @api
  */
 interface LoggerInterface
 {
diff --git a/lib/internal/Magento/Framework/Interception/ConfigInterface.php b/lib/internal/Magento/Framework/Interception/ConfigInterface.php
index 00d45c7551731..fabafd1d56365 100644
--- a/lib/internal/Magento/Framework/Interception/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Interception/ConfigInterface.php
@@ -1,15 +1,17 @@
 <?php
 /**
- * Interception config. Tells whether plugins have been added for type.
- *
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Interception;
 
 /**
  * Interface \Magento\Framework\Interception\ConfigInterface
+ * Interception config. Tells whether plugins have been added for type.
  *
+ * @api
  */
 interface ConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/Interception/ObjectManager/ConfigInterface.php b/lib/internal/Magento/Framework/Interception/ObjectManager/ConfigInterface.php
index 441d96d0b1fa4..d54410470a4bc 100644
--- a/lib/internal/Magento/Framework/Interception/ObjectManager/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/Interception/ObjectManager/ConfigInterface.php
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\Interception\ObjectManager;
 
 /**
  * Interface \Magento\Framework\Interception\ObjectManager\ConfigInterface
  *
+ * @api
  */
 interface ConfigInterface extends \Magento\Framework\ObjectManager\ConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/ObjectManager/ConfigCacheInterface.php b/lib/internal/Magento/Framework/ObjectManager/ConfigCacheInterface.php
index 8552dece04d77..17d8c17d30ed6 100644
--- a/lib/internal/Magento/Framework/ObjectManager/ConfigCacheInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/ConfigCacheInterface.php
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\ObjectManager;
 
 /**
  * Interface \Magento\Framework\ObjectManager\ConfigCacheInterface
  *
+ * @api
  */
 interface ConfigCacheInterface
 {
diff --git a/lib/internal/Magento/Framework/ObjectManager/ConfigInterface.php b/lib/internal/Magento/Framework/ObjectManager/ConfigInterface.php
index 0aebc15f9e403..a415549bd63a0 100644
--- a/lib/internal/Magento/Framework/ObjectManager/ConfigInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/ConfigInterface.php
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\ObjectManager;
 
 /**
  * Interface \Magento\Framework\ObjectManager\ConfigInterface
  *
+ * @api
  */
 interface ConfigInterface
 {
diff --git a/lib/internal/Magento/Framework/ObjectManager/RelationsInterface.php b/lib/internal/Magento/Framework/ObjectManager/RelationsInterface.php
index 21deeca418dad..908f2f32beb34 100644
--- a/lib/internal/Magento/Framework/ObjectManager/RelationsInterface.php
+++ b/lib/internal/Magento/Framework/ObjectManager/RelationsInterface.php
@@ -3,11 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\ObjectManager;
 
 /**
  * Interface \Magento\Framework\ObjectManager\RelationsInterface
  *
+ * @api
  */
 interface RelationsInterface
 {
diff --git a/lib/internal/Magento/Framework/View/DesignInterface.php b/lib/internal/Magento/Framework/View/DesignInterface.php
index ee501f1f494ad..64e11b09f6c36 100644
--- a/lib/internal/Magento/Framework/View/DesignInterface.php
+++ b/lib/internal/Magento/Framework/View/DesignInterface.php
@@ -3,10 +3,14 @@
  * Copyright © Magento, Inc. All rights reserved.
  * See COPYING.txt for license details.
  */
+declare(strict_types=1);
+
 namespace Magento\Framework\View;
 
 /**
- * Design Interface
+ * Interface \Magento\Framework\View\DesignInterface
+ *
+ * @api
  */
 interface DesignInterface
 {