Revert back AC-10573 changes due to PAT failure

Author: glo60612

app/code/Magento/Deploy/Package/Processor/PostProcessor/CssUrls.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright 2017 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 namespace Magento\Deploy\Package\Processor\PostProcessor;
 
@@ -66,7 +66,7 @@ public function process(Package $package, array $options)
             return false;
         }
         $urlMap = [];
-        /** @var string $fileId */
+        /** @var PackageFile $file */
         foreach (array_keys($package->getMap()) as $fileId) {
             $filePath = str_replace(\Magento\Framework\View\Asset\Repository::FILE_ID_SEPARATOR, '/', $fileId);
             // phpcs:ignore Magento2.Functions.DiscouragedFunction
@@ -227,9 +227,7 @@ private function getValidExternalUrl($url, Package $package)
         if (!$this->isFileExistsInPackage($filePath, $package)) {
             /** @var PackageFile $matchedFile */
             $matchedFile = $this->getFileFromParent($filePath, $package);
-            if ($matchedFile && $matchedFile->getPackage()) {
-                $package = $matchedFile->getPackage();
-            }
+            $package = $matchedFile->getPackage();
         }
         return preg_replace(
             '/(?<=}})(.*)(?=\/{{)/',

lib/internal/Magento/Framework/App/Test/Unit/View/Asset/PublisherTest.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright 2014 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 declare(strict_types=1);
 
@@ -115,46 +115,6 @@ public function testPublish()
         $this->assertTrue($this->object->publish($this->getAsset()));
     }
 
-    public function testPublishWithSourceFileNewer()
-    {
-        $this->staticDirRead->expects($this->once())
-            ->method('isExist')
-            ->with('some/file.ext')
-            ->willReturn(true);
-        $this->staticDirRead->expects($this->once())
-            ->method('readFile')
-            ->with('some/file.ext')
-            ->willReturn('test');
-
-        $materializationStrategy =
-            $this->getMockForAbstractClass(StrategyInterface::class);
-
-        $this->materializationStrategyFactory->expects($this->once())
-            ->method('create')
-            ->with($this->getAsset())
-            ->willReturn($materializationStrategy);
-        $materializationStrategy->expects($this->once())
-            ->method('publishFile')
-            ->with($this->sourceDirWrite, $this->staticDirWrite, 'file.ext', 'some/file.ext')
-            ->willReturn(true);
-
-        $this->assertTrue($this->object->publish($this->getAsset()));
-    }
-
-    public function testPublishWithSourceFileOlder()
-    {
-        $this->staticDirRead->expects($this->once())
-            ->method('isExist')
-            ->with('some/file.ext')
-            ->willReturn(true);
-        $this->staticDirRead->expects($this->once())
-            ->method('readFile')
-            ->with('some/file.ext')
-            ->willReturn(null);
-
-        $this->assertTrue($this->object->publish($this->getAsset()));
-    }
-
     /**
      * Create an asset mock
      *

lib/internal/Magento/Framework/App/View/Asset/Publisher.php

@@ -1,7 +1,7 @@
 <?php
 /**
- * Copyright 2011 Adobe
- * All Rights Reserved.
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
  */
 
 namespace Magento\Framework\App\View\Asset;
@@ -33,11 +33,6 @@ class Publisher
      */
     private $writeFactory;
 
-    /**
-     * @var array
-     */
-    private static $fileHashes = [];
-
     /**
      * @param \Magento\Framework\Filesystem $filesystem
      * @param MaterializationStrategy\Factory $materializationStrategyFactory
@@ -54,81 +49,19 @@ public function __construct(
     }
 
     /**
-     * Publish the asset
-     *
      * @param Asset\LocalInterface $asset
      * @return bool
      */
     public function publish(Asset\LocalInterface $asset)
     {
         $dir = $this->filesystem->getDirectoryRead(DirectoryList::STATIC_VIEW);
-        $targetPath = $asset->getPath();
-
-        // Check if target file exists and content hasn't changed
-        if ($dir->isExist($targetPath) && !$this->hasSourceFileChanged($asset, $dir, $targetPath)) {
+        if ($dir->isExist($asset->getPath())) {
             return true;
         }
 
         return $this->publishAsset($asset);
     }
 
-    /**
-     * Check if source file content has changed compared to target file
-     *
-     * @param Asset\LocalInterface $asset
-     * @param \Magento\Framework\Filesystem\Directory\ReadInterface $dir
-     * @param string $targetPath
-     * @return bool
-     */
-    private function hasSourceFileChanged(Asset\LocalInterface $asset, $dir, $targetPath)
-    {
-        $sourceFile = $asset->getSourceFile();
-        // Get source file hash
-        $sourceHash = $this->getFileHash($sourceFile);
-
-        // Get target file hash
-        $targetHash = $this->getTargetFileHash($dir, $targetPath);
-
-        // Compare hashes
-        return $sourceHash !== $targetHash;
-    }
-
-    /**
-     * Get file hash with caching
-     *
-     * @param string $filePath
-     * @return string|false
-     */
-    private function getFileHash($filePath)
-    {
-        if (!isset(self::$fileHashes[$filePath])) {
-            $content = @file_get_contents($filePath);
-            if ($content === false) {
-                self::$fileHashes[$filePath] = false;
-            } else {
-                self::$fileHashes[$filePath] = hash('sha256', $content);
-            }
-        }
-        return self::$fileHashes[$filePath];
-    }
-
-    /**
-     * Get target file hash
-     *
-     * @param \Magento\Framework\Filesystem\Directory\ReadInterface $dir
-     * @param string $targetPath
-     * @return string|false
-     */
-    private function getTargetFileHash($dir, $targetPath)
-    {
-        try {
-            $content = $dir->readFile($targetPath);
-            return hash('sha256', $content);
-        } catch (\Exception $e) {
-            return false;
-        }
-    }
-
     /**
      * Publish the asset
      *