Merge remote-tracking branch '39199/phpdoc/scopeConfig' into commprs_dec

Author: engcom-Charlie

lib/internal/Magento/Framework/App/Config.php

@@ -1,9 +1,9 @@
 <?php
 /**
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2013 Adobe
+ * All Rights Reserved.
  */
+
 namespace Magento\Framework\App;
 
 use Magento\Framework\App\Config\ConfigTypeInterface;
@@ -45,12 +45,7 @@ public function __construct(
     }
 
     /**
-     * Retrieve config value by path and scope
-     *
-     * @param string $path
-     * @param string $scope
-     * @param null|int|string $scopeCode
-     * @return mixed
+     * @inheritDoc
      */
     public function getValue(
         $path = null,
@@ -80,12 +75,7 @@ public function getValue(
     }
 
     /**
-     * Retrieve config flag
-     *
-     * @param string $path
-     * @param string $scope
-     * @param null|int|string $scopeCode
-     * @return bool
+     * @inheritDoc
      */
     public function isSetFlag($path, $scope = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null)
     {

lib/internal/Magento/Framework/App/Config/ScopeConfigInterface.php

@@ -1,9 +1,7 @@
 <?php
 /**
- * Configuration interface
- *
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+ * Copyright 2011 Adobe
+ * All Rights Reserved.
  */
 
 namespace Magento\Framework\App\Config;
@@ -17,14 +15,14 @@ interface ScopeConfigInterface
     /**
      * Default scope type
      */
-    const SCOPE_TYPE_DEFAULT = 'default';
+    public const SCOPE_TYPE_DEFAULT = 'default';
 
     /**
      * Retrieve config value by path and scope.
      *
      * @param string $path The path through the tree of configuration values, e.g., 'general/store_information/name'
      * @param string $scopeType The scope to use to determine config value, e.g., 'store' or 'default'
-     * @param null|int|string $scopeCode
+     * @param null|int|string|\Magento\Framework\App\ScopeInterface $scopeCode
      * @return mixed
      */
     public function getValue($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null);
@@ -34,7 +32,7 @@ public function getValue($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DE
      *
      * @param string $path The path through the tree of configuration values, e.g., 'general/store_information/name'
      * @param string $scopeType The scope to use to determine config value, e.g., 'store' or 'default'
-     * @param null|int|string $scopeCode
+     * @param null|int|string|\Magento\Framework\App\ScopeInterface $scopeCode
      * @return bool
      */
     public function isSetFlag($path, $scopeType = ScopeConfigInterface::SCOPE_TYPE_DEFAULT, $scopeCode = null);