From 1aad678c765cf9d4a4a22f85ce39baafb23fd4ef Mon Sep 17 00:00:00 2001
From: jisse Reitsma <jisse@yireo.com>
Date: Thu, 13 May 2021 11:33:07 +0200
Subject: [PATCH] Major cleanup

---
 CHANGELOG.md                                  |  4 ++
 Console/Command/CopyHacks.php                 | 41 ++++++++++++++
 .../PhpUnitFile/ToggleTestsCleanup.php        |  4 +-
 Copy/PathValidator.php                        | 30 +++++++++++
 .../DirectoryReadFactoryWithPathFixed.php     | 53 -------------------
 Override/DirectoryReadWithPathFixed.php       | 12 -----
 Override/TemplateFileValidator.php            | 13 +++++
 Plugin/FileValidator.php                      | 50 -----------------
 composer.json                                 |  2 +-
 etc/di.xml                                    |  9 +---
 10 files changed, 92 insertions(+), 126 deletions(-)
 create mode 100644 Console/Command/CopyHacks.php
 create mode 100644 Copy/PathValidator.php
 delete mode 100644 Override/DirectoryReadFactoryWithPathFixed.php
 delete mode 100644 Override/DirectoryReadWithPathFixed.php
 create mode 100644 Override/TemplateFileValidator.php
 delete mode 100644 Plugin/FileValidator.php

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04f5382..6c39e86 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.1.2] - 2021-05-13
+### Fixed
+- Fix new path validator by using "hack files"
+
 ## [0.1.1] - 2020-07-29
 ### Fixed
 - Fixed 2.4 compatibility
diff --git a/Console/Command/CopyHacks.php b/Console/Command/CopyHacks.php
new file mode 100644
index 0000000..d5cae9a
--- /dev/null
+++ b/Console/Command/CopyHacks.php
@@ -0,0 +1,41 @@
+<?php declare(strict_types=1);
+
+namespace Yireo\DevHacks\Console\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+class CopyHacks extends Command
+{
+    protected function configure()
+    {
+        $this->setName('yireo_devhacks:copy_hacks')
+            ->setDescription('Copy some hacks');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output)
+    {
+        $copyDir = dirname(__DIR__) . '/../Copy';
+        $copies = [
+            \Magento\Framework\Filesystem\Directory\PathValidator::class => 'PathValidator.php'
+        ];
+
+        foreach ($copies as $className => $copyFile) {
+            $originalFile = (new \ReflectionClass($className))->getFileName();
+            if (!file_exists($originalFile)) {
+                $output->writeln('<error>Original file does not exist: ' . $originalFile . '</error>');
+                continue;
+            }
+
+            $copyFile = $copyDir . '/' . $copyFile;
+            if (!file_exists($copyFile)) {
+                $output->writeln('<error>Hack file does not exist: ' . $copyFile . '</error>');
+                continue;
+            }
+
+            copy($copyFile, $originalFile);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Console/Command/IntegrationTesting/PhpUnitFile/ToggleTestsCleanup.php b/Console/Command/IntegrationTesting/PhpUnitFile/ToggleTestsCleanup.php
index 82088b0..dbfabaf 100644
--- a/Console/Command/IntegrationTesting/PhpUnitFile/ToggleTestsCleanup.php
+++ b/Console/Command/IntegrationTesting/PhpUnitFile/ToggleTestsCleanup.php
@@ -1,6 +1,4 @@
-<?php
-
-declare(strict_types=1);
+<?php declare(strict_types=1);
 
 namespace Yireo\DevHacks\Console\Command\IntegrationTesting\PhpUnitFile;
 
diff --git a/Copy/PathValidator.php b/Copy/PathValidator.php
new file mode 100644
index 0000000..9c3b148
--- /dev/null
+++ b/Copy/PathValidator.php
@@ -0,0 +1,30 @@
+<?php declare(strict_types=1);
+
+namespace Magento\Framework\Filesystem\Directory;
+
+use Magento\Framework\Filesystem\DriverInterface;
+
+/**
+ * @inheritDoc
+ *
+ * Validates paths using driver.
+ */
+class PathValidator implements PathValidatorInterface
+{
+    /**
+     * @param DriverInterface $driver
+     */
+    public function __construct(DriverInterface $driver)
+    {
+    }
+
+    /**
+     * @inheritDoc
+     */
+    public function validate(
+        string $directoryPath,
+        string $path,
+        ?string $scheme = null,
+        bool $absolutePath = false
+    ): void {}
+}
diff --git a/Override/DirectoryReadFactoryWithPathFixed.php b/Override/DirectoryReadFactoryWithPathFixed.php
deleted file mode 100644
index cdd9375..0000000
--- a/Override/DirectoryReadFactoryWithPathFixed.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yireo\DevHacks\Override;
-
-use Magento\Framework\Filesystem\Directory\ReadFactory as DirectoryReadFactory;
-use Magento\Framework\Filesystem\Directory\Read as DirectoryRead;
-use Magento\Framework\Filesystem\Directory\ReadInterface as DirectoryReadInterface;
-use Magento\Framework\Filesystem\DriverPool;
-use Magento\Framework\Filesystem\File\ReadFactory as FileReadFactory;
-
-/**
- * Class DirectoryReadFactoryWithPathFixed
- * @package Yireo\DevHacks\Override
- */
-class DirectoryReadFactoryWithPathFixed extends DirectoryReadFactory
-{
-    /**
-     * @var DriverPool
-     */
-    private $customDriverPool;
-
-    /**
-     * PathValidatorFix constructor.
-     * @param DriverPool $driverPool
-     */
-    public function __construct(
-        DriverPool $driverPool
-    ) {
-        parent::__construct($driverPool);
-        $this->customDriverPool = $driverPool;
-    }
-
-    /**
-     * @param string $path
-     * @param string $driverCode
-     * @return DirectoryReadInterface
-     */
-    public function create($path, $driverCode = DriverPool::FILE)
-    {
-        $driver = $this->customDriverPool->getDriver($driverCode);
-        $factory = new FileReadFactory(
-            $this->customDriverPool
-        );
-
-        return new DirectoryReadWithPathFixed(
-            $factory,
-            $driver,
-            $path
-        );
-    }
-}
diff --git a/Override/DirectoryReadWithPathFixed.php b/Override/DirectoryReadWithPathFixed.php
deleted file mode 100644
index 6175f26..0000000
--- a/Override/DirectoryReadWithPathFixed.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php declare(strict_types=1);
-
-namespace Yireo\DevHacks\Override;
-
-use Magento\Framework\Filesystem\Directory\Read;
-
-class DirectoryReadWithPathFixed extends Read
-{
-    protected function validatePath(?string $path, ?string $scheme = null, bool $absolutePath = false): void
-    {
-    }
-}
\ No newline at end of file
diff --git a/Override/TemplateFileValidator.php b/Override/TemplateFileValidator.php
new file mode 100644
index 0000000..c0f5b0b
--- /dev/null
+++ b/Override/TemplateFileValidator.php
@@ -0,0 +1,13 @@
+<?php declare(strict_types=1);
+
+namespace Yireo\DevHacks\Override;
+
+use Magento\Framework\View\Element\Template\File\Validator;
+
+class TemplateFileValidator extends Validator
+{
+    public function isValid($filename)
+    {
+        return true;
+    }
+}
\ No newline at end of file
diff --git a/Plugin/FileValidator.php b/Plugin/FileValidator.php
deleted file mode 100644
index baa1912..0000000
--- a/Plugin/FileValidator.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-namespace Yireo\DevHacks\Plugin;
-
-use Magento\Framework\App\State as AppState;
-
-/**
- * Class FileValidator
- * @package Yireo\DevHacks\Plugin
- */
-class FileValidator
-{
-    /**
-     * @var AppState
-     */
-    private $appState;
-
-    /**
-     * FileValidator constructor.
-     * @param AppState $appState
-     */
-    public function __construct(
-        AppState $appState
-    ) {
-        $this->appState = $appState;
-    }
-
-    /**
-     * Allow for any file as long as it exists to be used for a template
-     *
-     * @param object $subject
-     * @param callback $proceed
-     * @param string $filename
-     * @return bool
-     **/
-    public function aroundIsValid($subject, $proceed, $filename)
-    {
-        if ($this->appState->getMode() !== AppState::MODE_DEVELOPER) {
-            return $proceed($filename);
-        }
-
-        if ($filename == false || !is_file($filename)) {
-            return false;
-        }
-
-        return $proceed($filename) || file_exists($filename);
-    }
-}
diff --git a/composer.json b/composer.json
index f7c70ec..210eda7 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "yireo/magento2-devhacks",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "license": "OSL-3.0",
   "type": "magento2-module",
   "homepage": "https://github.com/yireo/Yireo_DevHacks",
diff --git a/etc/di.xml b/etc/di.xml
index 8e77c56..45b2bd8 100644
--- a/etc/di.xml
+++ b/etc/di.xml
@@ -1,17 +1,12 @@
 <?xml version="1.0"?>
 <config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
-    <preference for="Magento\Framework\Filesystem\Directory\ReadFactory" type="Yireo\DevHacks\Override\DirectoryReadFactoryWithPathFixed"/>
-
-    <preference for="Magento\Framework\Filesystem\Directory\ReadInterface" type="Yireo\DevHacks\Override\DirectoryReadWithPathFixed"/>
-
-    <type name="Magento\Framework\View\Element\Template\File\Validator">
-        <plugin name="templatesymlink_view_element_template_file_validator" type="Yireo\DevHacks\Plugin\FileValidator" sortOrder="10" disabled="false"/>
-    </type>
+    <preference for="Magento\Framework\View\Element\Template\File\Validator" type="Yireo\DevHacks\Override\TemplateFileValidator"/>
 
     <type name="Magento\Framework\Console\CommandList">
         <arguments>
             <argument name="commands" xsi:type="array">
                 <item name="yireo_devhacks_integrationtesting_phpunit_toggletestscleanup" xsi:type="object">Yireo\DevHacks\Console\Command\IntegrationTesting\PhpUnitFile\ToggleTestsCleanup</item>
+                <item name="yireo_devhacks_copy_hacks" xsi:type="object">Yireo\DevHacks\Console\Command\CopyHacks</item>
             </argument>
         </arguments>
     </type>