Regenerate validator specs and update SpecGenerator and Dumper classes

bin/generate-validator-spec.php

@@ -8,7 +8,7 @@
 if (! class_exists('Nette\PhpGenerator\ClassType')) {
     echo "ERROR: The optional package nette/php-generator is needed for code generation.\n";
     echo "Install the package via the following Composer command:\n";
-    echo "composer require --dev nette/php-generator:^3.5\n";
+    echo "composer require --dev nette/php-generator:3.6.1\n";
     exit -1;
 }
 

bin/src/Validator/SpecGenerator.php

@@ -298,7 +298,7 @@ private function gatherExtensionsMeta($bundlesConfig)
             if (!isset($extensions[$bundleConfig['name']])) {
                 $extensions[$bundleConfig['name']] = [
                     'versions' => [],
-                    'latestVersion' => null,
+                    'latestVersion' => '',
                 ];
             }
 

bin/src/Validator/SpecGenerator/Dumper.php

@@ -195,6 +195,16 @@ public function dumpWithKey($key, $value, $level, $parentKeys = [])
         return "{$this->getValueString($key)} => {$this->dump($value, $level, $parentKeys)}";
     }
 
+    /**
+     * Get the NetteDumper instance.
+     *
+     * @return NetteDumper
+     */
+    public function getDumper()
+    {
+        return $this->dumper;
+    }
+
     /**
      * Get the string representation of a value.
      *

bin/src/Validator/SpecGenerator/SpecPrinter.php

@@ -3,7 +3,6 @@
 namespace AmpProject\Tooling\Validator\SpecGenerator;
 
 use Nette\PhpGenerator\ClassType;
-use Nette\PhpGenerator\GlobalFunction;
 use Nette\PhpGenerator\Helpers;
 use Nette\PhpGenerator\Method;
 use Nette\PhpGenerator\PhpNamespace;
@@ -64,7 +63,7 @@ public function printClass(ClassType $class, PhpNamespace $namespace = null): st
         $consts = [];
         foreach ($class->getConstants() as $const) {
             $consts[] = Helpers::formatDocComment((string) $const->getComment())
-                . self::printAttributes($const->getAttributes(), $namespace)
+                . $this->printAttributes($const->getAttributes(), $namespace)
                 . "const {$const->getName()} = "
                 . $this->dumper->dump($const->getValue(), 0) . ";\n";
         }
@@ -77,7 +76,7 @@ public function printClass(ClassType $class, PhpNamespace $namespace = null): st
                 . '$' . $property->getName());
 
             $properties[] = Helpers::formatDocComment((string) $property->getComment())
-                . self::printAttributes($property->getAttributes(), $namespace)
+                . $this->printAttributes($property->getAttributes(), $namespace)
                 . $def
                 . ($property->getValue() === null && !$property->isInitialized()
                     ? ''
@@ -102,7 +101,7 @@ public function printClass(ClassType $class, PhpNamespace $namespace = null): st
 
         return Strings::normalize(
             Helpers::formatDocComment($class->getComment() . "\n")
-                . self::printAttributes($class->getAttributes(), $namespace)
+                . $this->printAttributes($class->getAttributes(), $namespace)
                 . ($class->isAbstract() ? 'abstract ' : '')
                 . ($class->isFinal() ? 'final ' : '')
                 . ($class->getName() ? $class->getType() . ' ' . $class->getName() . ' ' : '')
@@ -131,7 +130,7 @@ private function printResolvedMethod(Method $method, callable $resolver, PhpName
                 . $method->getName();
 
         return Helpers::formatDocComment($method->getComment() . "\n")
-               . self::printAttributes($method->getAttributes(), $namespace)
+               . $this->printAttributes($method->getAttributes(), $namespace)
                . $line
                . ($params = $this->printParameters($method, $namespace, strlen($line) + strlen($this->indentation) + 2))
                . ($method->isAbstract() || $method->getBody() === null
@@ -162,8 +161,8 @@ private function printAttributes(array $attrs, ?PhpNamespace $namespace, bool $i
         }
         $items = [];
         foreach ($attrs as $attr) {
-            $args = (new Dumper())->format('...?:', $attr->getArguments());
-            $items[] = $this->printType($attr->getName(), false, $namespace) . ($args ? "($args)" : '');
+            $args = $this->dumper->getDumper()->format('...?:', $attr->getArguments());
+            $items[] = "\\" . $this->printType($attr->getName(), false, $namespace) . ($args ? "($args)" : '');
         }
         return $inline
             ? '#[' . implode(', ', $items) . '] '

src/Attribute.php

@@ -532,6 +532,7 @@ interface Attribute
     const LOAD_MORE_FAILED                = 'load-more-failed';
     const LOAD_MORE_LOADING               = 'load-more-loading';
     const LOCALE                          = 'locale';
+    const LOCK_BOUNDS                     = 'lock-bounds';
     const LONGDESC                        = 'longdesc';
     const LOOP                            = 'loop';
     const LOW                             = 'low';
@@ -1134,6 +1135,9 @@ interface Attribute
     const DATA_WEBCARE_ID                  = 'data-webcare-id';
     const DATA_WIDGET_ID                   = 'data-widget-id';
     const DATA_WIDGET_TYPE                 = 'data-widget-type';
+    const DATA_X                           = 'data-x';
+    const DATA_Y                           = 'data-y';
+    const DATA_ZOOM                        = 'data-zoom';
 
     const CROSSORIGIN_ANONYMOUS       = 'anonymous';
     const CROSSORIGIN_USE_CREDENTIALS = 'use-credentials';