gulp-phug 1.3.4 → 1.3.5

package/support/vendor/phug/phug/src/Phug/Renderer/Renderer/Adapter/FileAdapter.php

@@ -364,8 +364,8 @@ class FileAdapter extends AbstractAdapter implements CacheInterface, LocatorInte
      * Return true if the file or content is up to date in the cache folder,
      * false else.
      *
-     * @param &string $path  to be filled
-     * @param string  $input file or pug code
+     * @param string &$path to be filled
+     * @param string $input file or pug code
      *
      * @return bool
      */
@@ -389,18 +389,35 @@ class FileAdapter extends AbstractAdapter implements CacheInterface, LocatorInte
         return file_exists($path);
     }
 
-    private function getCacheDirectory()
+    private function readCacheDirectoryFromOptions()
     {
         $cacheFolder = $this->hasOption('cache_dir')
             ? $this->getOption('cache_dir')
             : null;
+
         if (!$cacheFolder && $cacheFolder !== false) {
             $cacheFolder = $this->getRenderer()->hasOption('cache_dir')
                 ? $this->getRenderer()->getOption('cache_dir')
                 : null;
         }
+
         if ($cacheFolder === true) {
-            $cacheFolder = $this->getOption('tmp_dir');
+            return $this->getOption('tmp_dir');
+        }
+
+        return $cacheFolder;
+    }
+
+    private function getCacheDirectory()
+    {
+        $cacheFolder = $this->readCacheDirectoryFromOptions();
+
+        if ($cacheFolder === null) {
+            throw new RuntimeException(
+                'You need to set "cache_dir" option to a writable location in order '.
+                'to use cache feature.',
+                7
+            );
         }
 
         if (!is_dir($cacheFolder) && !@mkdir($cacheFolder, 0777, true)) {

package/support/vendor/phug/phug/src/Phug/Renderer/Renderer/Adapter/Stream/Template.php

@@ -19,6 +19,11 @@ class Template
      */
     private $data = '';
 
+    /**
+     * @var mixed
+     */
+    public $context;
+
     /**
      * @param $path
      *

package/support/vendor/phug/phug/src/Phug/Renderer/Renderer/Adapter/StreamAdapter.php

@@ -31,7 +31,7 @@ class StreamAdapter extends AbstractAdapter
     {
         $stream = $this->getOption('stream_name').$this->getOption('stream_suffix');
 
-        if (!in_array($stream, stream_get_wrappers())) {
+        if (!in_array($stream, stream_get_wrappers(), true)) {
             stream_register_wrapper($stream, Template::class);
         }
 

package/support/vendor/phug/phug/src/Phug/Renderer/Renderer/CacheInterface.php

@@ -11,7 +11,7 @@ interface CacheInterface
     /**
      * Return the cached file path after cache optional process.
      *
-     * @param $path
+     * @param string   $path
      * @param string   $input    pug input
      * @param callable $rendered method to compile the source into PHP
      * @param bool     $success

package/support/vendor/phug/phug/src/Phug/Renderer/Renderer/Partial/AdapterTrait.php

@@ -145,7 +145,7 @@ trait AdapterTrait
                     $adapter->displayCached($path, $input, $getSource, $parameters);
                 };
 
-                return in_array($method, ['display', 'displayFile'])
+                return in_array($method, ['display', 'displayFile'], true)
                     ? $display()
                     : $adapter->captureBuffer($display);
             }

package/support/vendor/phug/phug/src/Phug/Renderer/Renderer/Partial/Debug/DebuggerTrait.php

@@ -105,7 +105,7 @@ trait DebuggerTrait
         $contextLines = $data->options['error_context_lines'];
         $code = '';
         $sourceOffset = max(0, $line - 1);
-        $untilOffset = isset($source[$sourceOffset]) ? (mb_substr($source[$sourceOffset], 0, $offset ?: 0) ?: '') : '';
+        $untilOffset = isset($source[$sourceOffset]) ? mb_substr((string) $source[$sourceOffset], 0, $offset ?: 0) : '';
         $htmlError = $data->options['html_error'];
         $start = null;
         foreach ($source as $index => $lineText) {
@@ -178,17 +178,63 @@ trait DebuggerTrait
         ), $code, $error);
     }
 
+    /**
+     * @return bool
+     *
+     * @codeCoverageIgnore
+     */
     private function hasColorSupport()
     {
-        // @codeCoverageIgnoreStart
-        return DIRECTORY_SEPARATOR === '\\'
-            ? false !== getenv('ANSICON') ||
-            'ON' === getenv('ConEmuANSI') ||
-            false !== getenv('BABUN_HOME')
-            : (false !== getenv('BABUN_HOME')) ||
-            function_exists('posix_isatty') &&
-            @posix_isatty(STDOUT);
-        // @codeCoverageIgnoreEnd
+        if ('Hyper' === getenv('TERM_PROGRAM') || getenv('BABUN_HOME') !== false) {
+            return true;
+        }
+
+        if (DIRECTORY_SEPARATOR === '\\') {
+            return $this->hasStdOutVt100Support()
+                || getenv('ANSICON') !== false
+                || getenv('ConEmuANSI') === 'ON'
+                || getenv('TERM') === 'xterm';
+        }
+
+        return $this->isStdOutATTY();
+    }
+
+    /**
+     * @return bool
+     *
+     * @codeCoverageIgnore
+     */
+    private function hasStdOutVt100Support()
+    {
+        return defined('STDOUT')
+            && function_exists('sapi_windows_vt100_support')
+            && @sapi_windows_vt100_support(STDOUT);
+    }
+
+    /**
+     * @return bool
+     *
+     * @codeCoverageIgnore
+     */
+    private function isStdOutATTY()
+    {
+        if (!defined('STDOUT')) {
+            return false;
+        }
+
+        if (is_resource(STDOUT)) {
+            // These functions require a descriptor that is a real resource, not a numeric ID of it
+            if (function_exists('stream_isatty') && @stream_isatty(STDOUT)) {
+                return true;
+            }
+
+            $stat = @fstat(STDOUT);
+
+            // Check if formatted mode is S_IFCHR
+            return $stat ? 0020000 === ($stat['mode'] & 0170000) : false;
+        }
+
+        return function_exists('posix_isatty') && @posix_isatty(STDOUT);
     }
 
     private function getDebuggedException($error, $code, $source, $path, $parameters, $options)

package/support/vendor/phug/phug/src/Phug/Renderer/Renderer/Partial/RendererOptionsTrait.php

@@ -63,7 +63,7 @@ trait RendererOptionsTrait
     {
         /* @var ModuleContainerInterface $this */
 
-        if (in_array($className, class_implements($moduleClassName)) &&
+        if (in_array($className, class_implements($moduleClassName), true) &&
             !$container->hasModule($moduleClassName)
         ) {
             $container->addModule($moduleClassName);

package/support/vendor/phug/phug/src/Phug/Renderer/Renderer/Profiler/Dump.php

@@ -102,7 +102,7 @@ class Dump
             'string',
             'resource',
             'NULL',
-        ])) {
+        ], true)) {
             return var_export($object, true);
         }
 

package/support/vendor/phug/phug/src/Phug/Renderer/Renderer/Profiler/LinkDump.php

@@ -33,11 +33,11 @@ class LinkDump
         foreach ([
             ['current', EndLexEvent::class, 'lexing', [
                 'background' => '#7200c4',
-                'color' => 'white',
+                'color'      => 'white',
             ]],
             ['current', HtmlEvent::class, 'rendering', [
                 'background' => '#648481',
-                'color' => 'white',
+                'color'      => 'white',
             ]],
             ['previous', CompileEvent::class, '%s', [
                 'background' => '#ffff78',

package/support/vendor/phug/phug/src/Phug/Renderer/Renderer/Profiler/ProfilerModule.php

@@ -85,7 +85,7 @@ class ProfilerModule extends AbstractModule
 
         $this->eventDump = $this->getContainer()->getOption('profiler.dump_event');
 
-        if (in_array($this->eventDump, ['var_dump', 'print_r'])) {
+        if (in_array($this->eventDump, ['var_dump', 'print_r'], true)) {
             $function = $this->eventDump;
             $this->eventDump = function ($value) use ($function) {
                 return $this->getFunctionDump($value, $function);

package/support/vendor/phug/phug/src/Phug/Renderer/composer.json

@@ -7,9 +7,12 @@
     "homepage": "http://phug-lang.com",
     "authors": [
         {
-            "name": "KyleKatarn",
-            "email": "jade-php@selfbuild.fr",
+            "name": "kylekatarnls",
             "homepage": "http://github.com/kylekatarnls"
+        },
+        {
+            "name": "Torben Koehn",
+            "email": "torben@talesoft.codes"
         }
     ],
     "support": {
@@ -21,9 +24,10 @@
     "minimum-stability": "dev",
     "require": {
         "php": ">=5.5.0",
+        "phug/formatter": "^1.8.1",
         "phug/compiler": "^1.2",
         "phug/util": "^1.5",
-        "symfony/var-dumper": "^3.4 || ^4.0"
+        "symfony/var-dumper": "^3.4 || ^4.0 || ^5.0 || ^6.0 || ^7.0"
     },
     "autoload": {
         "psr-4": {

package/support/vendor/phug/phug/src/Phug/Util/CompatibilityUtil/TestCaseTyped.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace Phug\CompatibilityUtil;
+
+use PHPUnit\Framework\TestCase as PHPUnitTestCase;
+
+// @codeCoverageIgnoreStart
+if (!isset($testCaseInitialization) || !class_exists(TestCaseTypeBase::class, false)) {
+    return;
+}
+
+class TestCaseTypeBase extends PHPUnitTestCase
+{
+    protected function prepareTest()
+    {
+        // Override
+    }
+
+    protected function finishTest()
+    {
+        // Override
+    }
+
+    protected function setUp(): void
+    {
+        $this->prepareTest();
+    }
+
+    protected function tearDown(): void
+    {
+        $this->finishTest();
+    }
+
+    public static function assertMatchesRegularExpression(string $pattern, string $string, string $message = ''): void
+    {
+        if (!method_exists(parent::class, 'assertMatchesRegularExpression')) {
+            self::assertRegExp($pattern, $string, $message);
+
+            return;
+        }
+
+        parent::assertMatchesRegularExpression($pattern, $string, $message);
+    }
+
+    public static function assertFileDoesNotExist(string $filename, string $message = ''): void
+    {
+        if (!method_exists(parent::class, 'assertFileDoesNotExist')) {
+            self::assertFileNotExists($filename, $message);
+
+            return;
+        }
+
+        parent::assertFileDoesNotExist($filename, $message);
+    }
+
+    public static function assertIsArray($actual, string $message = ''): void
+    {
+        if (!method_exists(parent::class, 'assertIsArray')) {
+            self::assertSame('array', gettype($actual));
+
+            return;
+        }
+
+        parent::assertIsArray($actual, $message);
+    }
+}
+// @codeCoverageIgnoreEnd

package/support/vendor/phug/phug/src/Phug/Util/CompatibilityUtil/TestCaseUntyped.php

@@ -0,0 +1,67 @@
+<?php
+
+namespace Phug\CompatibilityUtil;
+
+use PHPUnit\Framework\TestCase as PHPUnitTestCase;
+
+// @codeCoverageIgnoreStart
+if (!isset($testCaseInitialization) || !class_exists(TestCaseTypeBase::class, false)) {
+    return;
+}
+
+class TestCaseTypeBase extends PHPUnitTestCase
+{
+    protected function prepareTest()
+    {
+        // Override
+    }
+
+    protected function finishTest()
+    {
+        // Override
+    }
+
+    protected function setUp()
+    {
+        $this->prepareTest();
+    }
+
+    protected function tearDown()
+    {
+        $this->finishTest();
+    }
+
+    public static function assertMatchesRegularExpression($pattern, $string, $message = '')
+    {
+        if (!method_exists(parent::class, 'assertMatchesRegularExpression')) {
+            self::assertRegExp($pattern, $string, $message);
+
+            return;
+        }
+
+        parent::assertMatchesRegularExpression($pattern, $string, $message);
+    }
+
+    public static function assertFileDoesNotExist($filename, $message = '')
+    {
+        if (!method_exists(parent::class, 'assertFileDoesNotExist')) {
+            self::assertFileNotExists($filename, $message);
+
+            return;
+        }
+
+        parent::assertFileDoesNotExist($filename, $message);
+    }
+
+    public static function assertIsArray($actual, $message = '')
+    {
+        if (!method_exists(parent::class, 'assertIsArray')) {
+            self::assertSame('array', gettype($actual));
+
+            return;
+        }
+
+        parent::assertIsArray($actual, $message);
+    }
+}
+// @codeCoverageIgnoreEnd

package/support/vendor/phug/phug/src/Phug/Util/Util/AttributesInterface.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace Phug\Util;
+
+use SplObjectStorage;
+
+/**
+ * Interface AttributesInterface.
+ */
+interface AttributesInterface
+{
+    /**
+     * @return SplObjectStorage
+     */
+    public function getAttributes();
+}

package/support/vendor/phug/phug/src/Phug/Util/Util/AttributesOrderInterface.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Phug\Util;
+
+/**
+ * Interface AttributesOrderInterface.
+ *
+ * Allow objects that have attributes to remember of the order in which attributes and assignments
+ * were added to them.
+ */
+interface AttributesOrderInterface
+{
+    /**
+     * @return int
+     */
+    public function getNextAttributeIndex();
+}

package/support/vendor/phug/phug/src/Phug/Util/Util/AttributesStorage.php

@@ -0,0 +1,44 @@
+<?php
+
+namespace Phug\Util;
+
+use ReturnTypeWillChange;
+use SplObjectStorage;
+
+class AttributesStorage extends SplObjectStorage
+{
+    /** @var mixed */
+    private $holder;
+
+    public function __construct($holder)
+    {
+        $this->holder = $holder;
+    }
+
+    #[ReturnTypeWillChange]
+    public function attach($object, $info = null)
+    {
+        if ($object instanceof OrderableInterface &&
+            $object->getOrder() === null &&
+            $this->holder instanceof AttributesOrderInterface
+        ) {
+            $object->setOrder($this->holder->getNextAttributeIndex());
+        }
+
+        parent::attach($object, $info);
+    }
+
+    #[ReturnTypeWillChange]
+    public function addAll($storage)
+    {
+        if ($storage && $this->holder instanceof AttributesOrderInterface) {
+            foreach ($storage as $element) {
+                if ($element instanceof OrderableInterface && $element->getOrder() === null) {
+                    $element->setOrder($this->holder->getNextAttributeIndex());
+                }
+            }
+        }
+
+        parent::addAll($storage);
+    }
+}

package/support/vendor/phug/phug/src/Phug/Util/Util/Collection.php

@@ -4,6 +4,7 @@ namespace Phug\Util;
 
 use Generator;
 use IteratorAggregate;
+use ReturnTypeWillChange;
 use Traversable;
 
 class Collection implements IteratorAggregate
@@ -51,6 +52,7 @@ class Collection implements IteratorAggregate
      *
      * @return Traversable An instance of an object implementing <b>Iterator</b> or <b>Traversable</b>
      */
+    #[ReturnTypeWillChange]
     public function getIterator()
     {
         return $this->traversable instanceof Traversable ? $this->traversable : $this->getGenerator();

package/support/vendor/phug/phug/src/Phug/Util/Util/OrderableInterface.php

@@ -0,0 +1,22 @@
+<?php
+
+namespace Phug\Util;
+
+/**
+ * Interface OrderableInterface.
+ *
+ * Allow objects to have an order index which allow, when compared to others in a list,
+ * to know if they were added earlier or later.
+ */
+interface OrderableInterface
+{
+    /**
+     * @return int|null
+     */
+    public function getOrder();
+
+    /**
+     * @param int|null $order
+     */
+    public function setOrder($order);
+}

package/support/vendor/phug/phug/src/Phug/Util/Util/OrderedValue.php

@@ -0,0 +1,25 @@
+<?php
+
+namespace Phug\Util;
+
+use Phug\Util\Partial\OrderTrait;
+use Phug\Util\Partial\ValueTrait;
+
+/**
+ * Class OrderedValue.
+ *
+ * @template T
+ *
+ * @template-implements ValueTrait<T>
+ */
+class OrderedValue implements OrderableInterface
+{
+    use ValueTrait;
+    use OrderTrait;
+
+    public function __construct($value, $order)
+    {
+        $this->value = $value;
+        $this->order = $order;
+    }
+}

package/support/vendor/phug/phug/src/Phug/Util/Util/Partial/AttributeTrait.php

@@ -2,6 +2,7 @@
 
 namespace Phug\Util\Partial;
 
+use Phug\Util\AttributesStorage;
 use SplObjectStorage;
 
 /**
@@ -20,7 +21,7 @@ trait AttributeTrait
     public function getAttributes()
     {
         if (!$this->attributes) {
-            $this->attributes = new SplObjectStorage();
+            $this->attributes = new AttributesStorage($this);
         }
 
         return $this->attributes;

package/support/vendor/phug/phug/src/Phug/Util/Util/Partial/AttributesOrderTrait.php

@@ -0,0 +1,19 @@
+<?php
+
+namespace Phug\Util\Partial;
+
+trait AttributesOrderTrait
+{
+    /**
+     * @var int
+     */
+    protected $attributeIndex = 0;
+
+    /**
+     * @return int
+     */
+    public function getNextAttributeIndex()
+    {
+        return $this->attributeIndex++;
+    }
+}

package/support/vendor/phug/phug/src/Phug/Util/Util/Partial/ModuleContainerTrait.php

@@ -27,7 +27,7 @@ trait ModuleContainerTrait
     public function hasModule($module)
     {
         return $module instanceof ModuleInterface
-            ? in_array($module, $this->modules)
+            ? in_array($module, $this->modules, true)
             : isset($this->modules[$module]);
     }
 
@@ -69,7 +69,7 @@ trait ModuleContainerTrait
     public function addModule($module)
     {
         if ($module instanceof ModuleInterface) {
-            if (in_array($module, $this->modules)) {
+            if (in_array($module, $this->modules, true)) {
                 throw new InvalidArgumentException(
                     'This occurrence of '.get_class($module).' is already registered.'
                 );
@@ -142,7 +142,7 @@ trait ModuleContainerTrait
     public function removeModule($module)
     {
         if ($module instanceof ModuleInterface) {
-            if (!in_array($module, $this->modules)) {
+            if (!in_array($module, $this->modules, true)) {
                 throw new InvalidArgumentException(
                     'This occurrence of '.get_class($module).' is not registered.'
                 );

package/support/vendor/phug/phug/src/Phug/Util/Util/Partial/OptionTrait.php

@@ -91,7 +91,7 @@ trait OptionTrait
 
     private function mergeOptionValue($name, $current, $addedValue, $functionName)
     {
-        if ($functionName === $this->recursiveReplaceFunction && in_array($name, $this->nonDeepOptions)) {
+        if ($functionName === $this->recursiveReplaceFunction && in_array($name, $this->nonDeepOptions, true)) {
             $functionName = $this->replaceFunction;
         }
 

package/support/vendor/phug/phug/src/Phug/Util/Util/Partial/OrderTrait.php

@@ -0,0 +1,27 @@
+<?php
+
+namespace Phug\Util\Partial;
+
+trait OrderTrait
+{
+    /**
+     * @var int|null
+     */
+    private $order = null;
+
+    /**
+     * @return int|null
+     */
+    public function getOrder()
+    {
+        return $this->order;
+    }
+
+    /**
+     * @param int|null $order
+     */
+    public function setOrder($order)
+    {
+        $this->order = $order;
+    }
+}

package/support/vendor/phug/phug/src/Phug/Util/Util/Partial/StaticMemberTrait.php

@@ -19,7 +19,7 @@ trait StaticMemberTrait
             return
                 count($tokens) === 1 &&
                 is_array($tokens[0]) &&
-                in_array($tokens[0][0], [T_CONSTANT_ENCAPSED_STRING, T_DNUMBER, T_LNUMBER]);
+                in_array($tokens[0][0], [T_CONSTANT_ENCAPSED_STRING, T_DNUMBER, T_LNUMBER], true);
         }
 
         return false;

package/support/vendor/phug/phug/src/Phug/Util/Util/Partial/ValueTrait.php

@@ -4,18 +4,20 @@ namespace Phug\Util\Partial;
 
 /**
  * Class ValueTrait.
+ *
+ * @template T of mixed
  */
 trait ValueTrait
 {
     use StaticMemberTrait;
 
     /**
-     * @var mixed
+     * @var T
      */
     private $value = null;
 
     /**
-     * @return mixed
+     * @return T
      */
     public function getValue()
     {
@@ -31,7 +33,7 @@ trait ValueTrait
     }
 
     /**
-     * @param mixed $value
+     * @param T $value
      *
      * @return $this
      */