Port TypeParser to Hoa\Compiler

composer.json

@@ -18,9 +18,9 @@
     "require": {
         "php": "^7.2",
         "jms/metadata": "~1.1",
-        "jms/parser-lib": "1.*",
         "doctrine/annotations": "^1.0",
-        "doctrine/instantiator": "^1.0.3"
+        "doctrine/instantiator": "^1.0.3",
+        "hoa/compiler": "^3.17.08.08"
     },
     "suggest": {
         "symfony/yaml": "Required if you'd like to use the YAML metadata format.",
@@ -43,6 +43,11 @@
         "symfony/expression-language": "^3.0|^4.0",
         "phpunit/phpunit": "^7.1"
     },
+    "conflict": {
+        "hoa/core": "*",
+        "hoa/consistency": "<1.17.05.02",
+        "hoa/iterator": "<2.16.03.15"
+    },
     "autoload": {
         "psr-4": {
             "JMS\\Serializer\\": "src/"

src/Builder/DefaultDriverFactory.php

@@ -5,12 +5,12 @@
 namespace JMS\Serializer\Builder;
 
 use Doctrine\Common\Annotations\Reader;
-use JMS\Parser\AbstractParser;
 use JMS\Serializer\Metadata\Driver\AnnotationDriver;
 use JMS\Serializer\Metadata\Driver\XmlDriver;
 use JMS\Serializer\Metadata\Driver\YamlDriver;
 use JMS\Serializer\Naming\PropertyNamingStrategyInterface;
-use JMS\Serializer\TypeParser;
+use JMS\Serializer\Type\Parser;
+use JMS\Serializer\Type\ParserInterface;
 use Metadata\Driver\DriverChain;
 use Metadata\Driver\DriverInterface;
 use Metadata\Driver\FileLocator;
@@ -23,9 +23,9 @@ final class DefaultDriverFactory implements DriverFactoryInterface
      */
     private $propertyNamingStrategy;
 
-    public function __construct(PropertyNamingStrategyInterface $propertyNamingStrategy, AbstractParser $typeParser = null)
+    public function __construct(PropertyNamingStrategyInterface $propertyNamingStrategy, ParserInterface $typeParser = null)
     {
-        $this->typeParser = $typeParser ?: new TypeParser();
+        $this->typeParser = $typeParser ?: new Parser();
         $this->propertyNamingStrategy = $propertyNamingStrategy;
     }
 

src/Metadata/Driver/AbstractDoctrineTypeDriver.php

@@ -22,13 +22,13 @@
 
 use Doctrine\Common\Persistence\ManagerRegistry;
 use Doctrine\Common\Persistence\Mapping\ClassMetadata as DoctrineClassMetadata;
-use JMS\Parser\AbstractParser;
 use JMS\Serializer\Metadata\ClassMetadata;
 use JMS\Serializer\Metadata\ExpressionPropertyMetadata;
 use JMS\Serializer\Metadata\PropertyMetadata;
 use JMS\Serializer\Metadata\StaticPropertyMetadata;
 use JMS\Serializer\Metadata\VirtualPropertyMetadata;
-use JMS\Serializer\TypeParser;
+use JMS\Serializer\Type\Parser;
+use JMS\Serializer\Type\ParserInterface;
 use Metadata\Driver\DriverInterface;
 
 /**
@@ -78,11 +78,11 @@ abstract class AbstractDoctrineTypeDriver implements DriverInterface
 
     protected $typeParser;
 
-    public function __construct(DriverInterface $delegate, ManagerRegistry $registry, AbstractParser $typeParser = null)
+    public function __construct(DriverInterface $delegate, ManagerRegistry $registry, ParserInterface $typeParser = null)
     {
         $this->delegate = $delegate;
         $this->registry = $registry;
-        $this->typeParser = $typeParser ?: new TypeParser();
+        $this->typeParser = $typeParser ?: new Parser();
     }
 
     public function loadMetadataForClass(\ReflectionClass $class)

src/Metadata/Driver/AnnotationDriver.php

@@ -21,7 +21,6 @@
 namespace JMS\Serializer\Metadata\Driver;
 
 use Doctrine\Common\Annotations\Reader;
-use JMS\Parser\AbstractParser;
 use JMS\Serializer\Annotation\Accessor;
 use JMS\Serializer\Annotation\AccessorOrder;
 use JMS\Serializer\Annotation\AccessType;
@@ -59,7 +58,8 @@
 use JMS\Serializer\Metadata\PropertyMetadata;
 use JMS\Serializer\Metadata\VirtualPropertyMetadata;
 use JMS\Serializer\Naming\PropertyNamingStrategyInterface;
-use JMS\Serializer\TypeParser;
+use JMS\Serializer\Type\Parser;
+use JMS\Serializer\Type\ParserInterface;
 use Metadata\Driver\DriverInterface;
 use Metadata\MethodMetadata;
 
@@ -72,10 +72,10 @@ class AnnotationDriver implements DriverInterface
      */
     private $namingStrategy;
 
-    public function __construct(Reader $reader, PropertyNamingStrategyInterface $namingStrategy, AbstractParser $typeParser = null)
+    public function __construct(Reader $reader, PropertyNamingStrategyInterface $namingStrategy, ParserInterface $typeParser = null)
     {
         $this->reader = $reader;
-        $this->typeParser = $typeParser ?: new TypeParser();
+        $this->typeParser = $typeParser ?: new Parser();
         $this->namingStrategy = $namingStrategy;
     }
 

src/Metadata/Driver/XmlDriver.php

@@ -20,7 +20,6 @@
 
 namespace JMS\Serializer\Metadata\Driver;
 
-use JMS\Parser\AbstractParser;
 use JMS\Serializer\Annotation\ExclusionPolicy;
 use JMS\Serializer\Exception\RuntimeException;
 use JMS\Serializer\Exception\XmlErrorException;
@@ -29,7 +28,8 @@
 use JMS\Serializer\Metadata\PropertyMetadata;
 use JMS\Serializer\Metadata\VirtualPropertyMetadata;
 use JMS\Serializer\Naming\PropertyNamingStrategyInterface;
-use JMS\Serializer\TypeParser;
+use JMS\Serializer\Type\Parser;
+use JMS\Serializer\Type\ParserInterface;
 use Metadata\Driver\AbstractFileDriver;
 use Metadata\Driver\FileLocatorInterface;
 use Metadata\MethodMetadata;
@@ -42,10 +42,10 @@ class XmlDriver extends AbstractFileDriver
      */
     private $namingStrategy;
 
-    public function __construct(FileLocatorInterface $locator, PropertyNamingStrategyInterface $namingStrategy, AbstractParser $typeParser = null)
+    public function __construct(FileLocatorInterface $locator, PropertyNamingStrategyInterface $namingStrategy, ParserInterface $typeParser = null)
     {
         parent::__construct($locator);
-        $this->typeParser = $typeParser ?: new TypeParser();
+        $this->typeParser = $typeParser ?? new Parser();
         $this->namingStrategy = $namingStrategy;
     }
 

src/Metadata/Driver/YamlDriver.php

@@ -20,15 +20,15 @@
 
 namespace JMS\Serializer\Metadata\Driver;
 
-use JMS\Parser\AbstractParser;
 use JMS\Serializer\Annotation\ExclusionPolicy;
 use JMS\Serializer\Exception\RuntimeException;
 use JMS\Serializer\Metadata\ClassMetadata;
 use JMS\Serializer\Metadata\ExpressionPropertyMetadata;
 use JMS\Serializer\Metadata\PropertyMetadata;
 use JMS\Serializer\Metadata\VirtualPropertyMetadata;
 use JMS\Serializer\Naming\PropertyNamingStrategyInterface;
-use JMS\Serializer\TypeParser;
+use JMS\Serializer\Type\Parser;
+use JMS\Serializer\Type\ParserInterface;
 use Metadata\Driver\AbstractFileDriver;
 use Metadata\Driver\FileLocatorInterface;
 use Metadata\MethodMetadata;
@@ -42,10 +42,10 @@ class YamlDriver extends AbstractFileDriver
      */
     private $namingStrategy;
 
-    public function __construct(FileLocatorInterface $locator, PropertyNamingStrategyInterface $namingStrategy, AbstractParser $typeParser = null)
+    public function __construct(FileLocatorInterface $locator, PropertyNamingStrategyInterface $namingStrategy, ParserInterface $typeParser = null)
     {
         parent::__construct($locator);
-        $this->typeParser = $typeParser ?: new TypeParser();
+        $this->typeParser = $typeParser ?? new Parser();
         $this->namingStrategy = $namingStrategy;
     }
 

src/Serializer.php

@@ -20,7 +20,6 @@
 
 namespace JMS\Serializer;
 
-use JMS\Parser\AbstractParser;
 use JMS\Serializer\ContextFactory\DefaultDeserializationContextFactory;
 use JMS\Serializer\ContextFactory\DefaultSerializationContextFactory;
 use JMS\Serializer\ContextFactory\DeserializationContextFactoryInterface;
@@ -31,6 +30,8 @@
 use JMS\Serializer\GraphNavigator\Factory\GraphNavigatorFactoryInterface;
 use JMS\Serializer\Visitor\Factory\DeserializationVisitorFactory;
 use JMS\Serializer\Visitor\Factory\SerializationVisitorFactory;
+use JMS\Serializer\Type\Parser;
+use JMS\Serializer\Type\ParserInterface;
 use Metadata\MetadataFactoryInterface;
 
 /**
@@ -82,7 +83,7 @@ final class Serializer implements SerializerInterface, ArrayTransformerInterface
      * @param DeserializationVisitorFactory[] $deserializationVisitors
      * @param SerializationContextFactoryInterface|null $serializationContextFactory
      * @param DeserializationContextFactoryInterface|null $deserializationContextFactory
-     * @param AbstractParser|null $typeParser
+     * @param ParserInterface|null $typeParser
      */
     public function __construct(
         MetadataFactoryInterface $factory,
@@ -91,14 +92,14 @@ public function __construct(
         array $deserializationVisitors,
         SerializationContextFactoryInterface $serializationContextFactory = null,
         DeserializationContextFactoryInterface $deserializationContextFactory = null,
-        AbstractParser $typeParser = null
+        ParserInterface $typeParser = null
     ) {
         $this->factory = $factory;
         $this->graphNavigators = $graphNavigators;
         $this->serializationVisitors = $serializationVisitors;
         $this->deserializationVisitors = $deserializationVisitors;
 
-        $this->typeParser = $typeParser ?: new TypeParser();
+        $this->typeParser = $typeParser ?? new Parser();
 
         $this->serializationContextFactory = $serializationContextFactory ?: new DefaultSerializationContextFactory();
         $this->deserializationContextFactory = $deserializationContextFactory ?: new DefaultDeserializationContextFactory();

src/SerializerBuilder.php

@@ -24,7 +24,6 @@
 use Doctrine\Common\Annotations\CachedReader;
 use Doctrine\Common\Annotations\Reader;
 use Doctrine\Common\Cache\FilesystemCache;
-use JMS\Parser\AbstractParser;
 use JMS\Serializer\Accessor\AccessorStrategyInterface;
 use JMS\Serializer\Accessor\DefaultAccessorStrategy;
 use JMS\Serializer\Accessor\ExpressionAccessorStrategy;
@@ -53,6 +52,8 @@
 use JMS\Serializer\Naming\CamelCaseNamingStrategy;
 use JMS\Serializer\Naming\PropertyNamingStrategyInterface;
 use JMS\Serializer\Naming\SerializedNameAnnotationStrategy;
+use JMS\Serializer\Type\Parser;
+use JMS\Serializer\Type\ParserInterface;
 use JMS\Serializer\Visitor\Factory\DeserializationVisitorFactory;
 use JMS\Serializer\Visitor\Factory\JsonDeserializationVisitorFactory;
 use JMS\Serializer\Visitor\Factory\JsonSerializationVisitorFactory;
@@ -109,7 +110,7 @@ public static function create(...$args)
 
     public function __construct(HandlerRegistryInterface $handlerRegistry = null, EventDispatcherInterface $eventDispatcher = null)
     {
-        $this->typeParser = new TypeParser();
+        $this->typeParser = new Parser();
         $this->handlerRegistry = $handlerRegistry ?: new HandlerRegistry();
         $this->eventDispatcher = $eventDispatcher ?: new EventDispatcher();
         $this->serializationVisitors = [];
@@ -148,7 +149,7 @@ public function setExpressionEvaluator(ExpressionEvaluatorInterface $expressionE
         return $this;
     }
 
-    public function setTypeParser(AbstractParser $parser): self
+    public function setTypeParser(ParserInterface $parser): self
     {
         $this->typeParser = $parser;
 

src/Type/Exception/Exception.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Copyright 2016 Johannes M. Schmitt <schmittjoh@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace JMS\Serializer\Type\Exception;
+
+use JMS\Serializer\Exception\Exception as BaseException;
+
+interface Exception extends BaseException
+{
+}

src/Type/Exception/InvalidNode.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Copyright 2016 Johannes M. Schmitt <schmittjoh@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace JMS\Serializer\Type\Exception;
+
+final class InvalidNode extends \LogicException implements Exception
+{
+}

src/Type/Exception/SyntaxError.php

@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Copyright 2016 Johannes M. Schmitt <schmittjoh@gmail.com>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+namespace JMS\Serializer\Type\Exception;
+
+final class SyntaxError extends \RuntimeException implements Exception
+{
+}