From a8fec13eebb727ee4e589c47fe3e2c2a97bf0e6f Mon Sep 17 00:00:00 2001
From: Raul E Watson <raul.watson@maginus.com>
Date: Fri, 6 Mar 2020 16:27:38 +0000
Subject: [PATCH 1/2] Remove @author annotation from Magento framework

---
 .../Magento/Framework/Component/ComponentRegistrar.php       | 2 --
 .../Framework/Component/ComponentRegistrarInterface.php      | 3 ---
 lib/internal/Magento/Framework/Module/ModuleList/Loader.php  | 5 ++---
 3 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/lib/internal/Magento/Framework/Component/ComponentRegistrar.php b/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
index 0a54d770300e8..8dba61bc5945b 100644
--- a/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
+++ b/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
@@ -8,8 +8,6 @@
 /**
  * Provides ability to statically register components.
  *
- * @author Josh Di Fabio <joshdifabio@gmail.com>
- *
  * @api
  */
 class ComponentRegistrar implements ComponentRegistrarInterface
diff --git a/lib/internal/Magento/Framework/Component/ComponentRegistrarInterface.php b/lib/internal/Magento/Framework/Component/ComponentRegistrarInterface.php
index 04d7676eff3c0..eb7144306b593 100644
--- a/lib/internal/Magento/Framework/Component/ComponentRegistrarInterface.php
+++ b/lib/internal/Magento/Framework/Component/ComponentRegistrarInterface.php
@@ -5,9 +5,6 @@
  */
 namespace Magento\Framework\Component;
 
-/**
- * @author Josh Di Fabio <joshdifabio@gmail.com>
- */
 interface ComponentRegistrarInterface
 {
     /**
diff --git a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
index b1d21a6db5f16..704d259be6486 100644
--- a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
+++ b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
@@ -80,7 +80,7 @@ public function load(array $exclude = [])
         $result = [];
         $excludeSet = array_flip($exclude);
 
-        foreach ($this->getModuleConfigs() as list($file, $contents)) {
+        foreach ($this->getModuleConfigs() as [$file, $contents]) {
             try {
                 $this->parser->loadXML($contents);
             } catch (\Magento\Framework\Exception\LocalizedException $e) {
@@ -111,8 +111,7 @@ public function load(array $exclude = [])
      * </code>
      *
      * @return \Traversable
-     *
-     * @author Josh Di Fabio <joshdifabio@gmail.com>
+     * @throws \Magento\Framework\Exception\FileSystemException
      */
     private function getModuleConfigs()
     {

From e01eda97df7ac400636e52dd8f454affb4e652ea Mon Sep 17 00:00:00 2001
From: Raul E Watson <raul.watson@maginus.com>
Date: Sat, 7 Mar 2020 01:59:32 +0000
Subject: [PATCH 2/2] address static build failures

---
 .../Magento/Framework/Component/ComponentRegistrar.php     | 7 +++----
 .../Magento/Framework/Module/ModuleList/Loader.php         | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/lib/internal/Magento/Framework/Component/ComponentRegistrar.php b/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
index 8dba61bc5945b..bd20582875ce0 100644
--- a/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
+++ b/lib/internal/Magento/Framework/Component/ComponentRegistrar.php
@@ -48,13 +48,12 @@ public static function register($type, $componentName, $path)
                 ucfirst($type) . ' \'' . $componentName . '\' from \'' . $path . '\' '
                 . 'has been already defined in \'' . self::$paths[$type][$componentName] . '\'.'
             );
-        } else {
-            self::$paths[$type][$componentName] = str_replace('\\', '/', $path);
         }
+        self::$paths[$type][$componentName] = str_replace('\\', '/', $path);
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPaths($type)
     {
@@ -63,7 +62,7 @@ public function getPaths($type)
     }
 
     /**
-     * {@inheritdoc}
+     * @inheritdoc
      */
     public function getPath($type, $componentName)
     {
diff --git a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
index 704d259be6486..7e484407d7a54 100644
--- a/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
+++ b/lib/internal/Magento/Framework/Module/ModuleList/Loader.php
@@ -80,7 +80,7 @@ public function load(array $exclude = [])
         $result = [];
         $excludeSet = array_flip($exclude);
 
-        foreach ($this->getModuleConfigs() as [$file, $contents]) {
+        foreach ($this->getModuleConfigs() as list($file, $contents)) {
             try {
                 $this->parser->loadXML($contents);
             } catch (\Magento\Framework\Exception\LocalizedException $e) {