Merge pull request #193 from Majkl578/dev/open-2.0

Open 2.0 - PHP 7.2, change namespace

.travis.yml

@@ -3,7 +3,6 @@ sudo: false
 language: php
 
 php:
-  - 7.1
   - 7.2
   - nightly
 

README.md

@@ -14,4 +14,4 @@ See the [doctrine-project website](https://www.doctrine-project.org/projects/doc
 
 ## Changelog
 
-See [CHANGELOG.md](CHANGELOG.md).
+See [UPGRADE.md](UPGRADE.md).

CHANGELOG.md → UPGRADE.md

@@ -1,4 +1,15 @@
-## Changelog
+# Upgrade to 2.0
+
+## Namespace changed to Doctrine\Annotations
+
+Namespace of this library has been changed from `Doctrine\Common\Annotations` to `Doctrine\Annotations`.
+
+## PHP 7.2 is now required
+
+Doctrine Annotations now requires PHP 7.2 or newer.
+
+
+## 1.x Changelog
 
 ### 1.5.0
 

composer.json

@@ -13,7 +13,7 @@
         {"name": "Johannes Schmitt", "email": "schmittjoh@gmail.com"}
     ],
     "require": {
-        "php": "^7.1",
+        "php": "^7.2",
         "doctrine/lexer": "1.*"
     },
     "require-dev": {
@@ -24,14 +24,14 @@
         "sort-packages": true
     },
     "autoload": {
-        "psr-4": { "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations" }
+        "psr-4": { "Doctrine\\Annotations\\": "lib/Doctrine/Annotations" }
     },
     "autoload-dev": {
-        "psr-4": { "Doctrine\\Tests\\Common\\Annotations\\": "tests/Doctrine/Tests/Common/Annotations" }
+        "psr-4": { "Doctrine\\Tests\\Annotations\\": "tests/Doctrine/Tests/Annotations" }
     },
     "extra": {
         "branch-alias": {
-            "dev-master": "1.7.x-dev"
+            "dev-master": "2.0.x-dev"
         }
     }
 }

docs/en/index.rst

@@ -59,9 +59,9 @@ Reading annotations
 
 The access to the annotations happens by reflection of the class
 containing them. There are multiple reader-classes implementing the
-``Doctrine\Common\Annotations\Reader`` interface, that can
+``Doctrine\Annotations\Reader`` interface, that can
 access the annotations of a class. A common one is
-``Doctrine\Common\Annotations\AnnotationReader``:
+``Doctrine\Annotations\AnnotationReader``:
 
 .. code-block:: php
 

lib/Doctrine/Common/Annotations/Annotation.php → lib/Doctrine/Annotations/Annotation.php

@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations;
+namespace Doctrine\Annotations;
 
 /**
  * Annotations class.

lib/Doctrine/Common/Annotations/Annotation/Attribute.php → lib/Doctrine/Annotations/Annotation/Attribute.php

@@ -18,7 +18,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations\Annotation;
+namespace Doctrine\Annotations\Annotation;
 
 /**
  * Annotation that can be used to signal to the parser

lib/Doctrine/Common/Annotations/Annotation/Attributes.php → lib/Doctrine/Annotations/Annotation/Attributes.php

@@ -18,7 +18,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations\Annotation;
+namespace Doctrine\Annotations\Annotation;
 
 /**
  * Annotation that can be used to signal to the parser
@@ -31,7 +31,7 @@
 final class Attributes
 {
     /**
-     * @var array<Doctrine\Common\Annotations\Annotation\Attribute>
+     * @var array<Doctrine\Annotations\Annotation\Attribute>
      */
     public $value;
 }

lib/Doctrine/Common/Annotations/Annotation/Enum.php → lib/Doctrine/Annotations/Annotation/Enum.php

@@ -18,7 +18,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations\Annotation;
+namespace Doctrine\Annotations\Annotation;
 
 /**
  * Annotation that can be used to signal to the parser

lib/Doctrine/Common/Annotations/Annotation/IgnoreAnnotation.php → lib/Doctrine/Annotations/Annotation/IgnoreAnnotation.php

@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations\Annotation;
+namespace Doctrine\Annotations\Annotation;
 
 /**
  * Annotation that can be used to signal to the parser to ignore specific

lib/Doctrine/Common/Annotations/Annotation/Required.php → lib/Doctrine/Annotations/Annotation/Required.php

@@ -18,7 +18,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations\Annotation;
+namespace Doctrine\Annotations\Annotation;
 
 /**
  * Annotation that can be used to signal to the parser

lib/Doctrine/Common/Annotations/Annotation/Target.php → lib/Doctrine/Annotations/Annotation/Target.php

@@ -18,7 +18,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations\Annotation;
+namespace Doctrine\Annotations\Annotation;
 
 /**
  * Annotation that can be used to signal to the parser

lib/Doctrine/Common/Annotations/AnnotationException.php → lib/Doctrine/Annotations/AnnotationException.php

@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations;
+namespace Doctrine\Annotations;
 
 /**
  * Description of AnnotationException

lib/Doctrine/Common/Annotations/AnnotationReader.php → lib/Doctrine/Annotations/AnnotationReader.php

@@ -17,10 +17,10 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations;
+namespace Doctrine\Annotations;
 
-use Doctrine\Common\Annotations\Annotation\IgnoreAnnotation;
-use Doctrine\Common\Annotations\Annotation\Target;
+use Doctrine\Annotations\Annotation\IgnoreAnnotation;
+use Doctrine\Annotations\Annotation\Target;
 use ReflectionClass;
 use ReflectionMethod;
 use ReflectionProperty;
@@ -42,7 +42,7 @@ class AnnotationReader implements Reader
      * @var array
      */
     private static $globalImports = [
-        'ignoreannotation' => 'Doctrine\Common\Annotations\Annotation\IgnoreAnnotation',
+        'ignoreannotation' => 'Doctrine\Annotations\Annotation\IgnoreAnnotation',
     ];
 
     /**
@@ -136,21 +136,21 @@ static public function addGlobalIgnoredNamespace($namespace)
     /**
      * Annotations parser.
      *
-     * @var \Doctrine\Common\Annotations\DocParser
+     * @var \Doctrine\Annotations\DocParser
      */
     private $parser;
 
     /**
      * Annotations parser used to collect parsing metadata.
      *
-     * @var \Doctrine\Common\Annotations\DocParser
+     * @var \Doctrine\Annotations\DocParser
      */
     private $preParser;
 
     /**
      * PHP parser used to collect imports.
      *
-     * @var \Doctrine\Common\Annotations\PhpParser
+     * @var \Doctrine\Annotations\PhpParser
      */
     private $phpParser;
 

lib/Doctrine/Common/Annotations/AnnotationRegistry.php → lib/Doctrine/Annotations/AnnotationRegistry.php

@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations;
+namespace Doctrine\Annotations;
 
 final class AnnotationRegistry
 {

lib/Doctrine/Common/Annotations/CachedReader.php → lib/Doctrine/Annotations/CachedReader.php

@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations;
+namespace Doctrine\Annotations;
 
 use Doctrine\Common\Cache\Cache;
 use ReflectionClass;

lib/Doctrine/Common/Annotations/DocLexer.php → lib/Doctrine/Annotations/DocLexer.php

@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations;
+namespace Doctrine\Annotations;
 
 use Doctrine\Common\Lexer\AbstractLexer;
 

lib/Doctrine/Common/Annotations/DocParser.php → lib/Doctrine/Annotations/DocParser.php

@@ -17,13 +17,13 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations;
+namespace Doctrine\Annotations;
 
-use Doctrine\Common\Annotations\Annotation\Attribute;
+use Doctrine\Annotations\Annotation\Attribute;
 use ReflectionClass;
-use Doctrine\Common\Annotations\Annotation\Enum;
-use Doctrine\Common\Annotations\Annotation\Target;
-use Doctrine\Common\Annotations\Annotation\Attributes;
+use Doctrine\Annotations\Annotation\Enum;
+use Doctrine\Annotations\Annotation\Target;
+use Doctrine\Annotations\Annotation\Attributes;
 
 /**
  * A parser for docblock annotations.
@@ -54,7 +54,7 @@ final class DocParser
     /**
      * The lexer.
      *
-     * @var \Doctrine\Common\Annotations\DocLexer
+     * @var \Doctrine\Annotations\DocLexer
      */
     private $lexer;
 
@@ -68,7 +68,7 @@ final class DocParser
     /**
      * Doc parser used to collect annotation target.
      *
-     * @var \Doctrine\Common\Annotations\DocParser
+     * @var \Doctrine\Annotations\DocParser
      */
     private static $metadataParser;
 
@@ -138,7 +138,7 @@ final class DocParser
      * @var array
      */
     private static $annotationMetadata = [
-        'Doctrine\Common\Annotations\Annotation\Target' => [
+        'Doctrine\Annotations\Annotation\Target' => [
             'is_annotation'    => true,
             'has_constructor'  => true,
             'properties'       => [],
@@ -154,7 +154,7 @@ final class DocParser
                 ]
              ],
         ],
-        'Doctrine\Common\Annotations\Annotation\Attribute' => [
+        'Doctrine\Annotations\Annotation\Attribute' => [
             'is_annotation'    => true,
             'has_constructor'  => false,
             'targets_literal'  => 'ANNOTATION_ANNOTATION',
@@ -183,7 +183,7 @@ final class DocParser
                 ]
              ],
         ],
-        'Doctrine\Common\Annotations\Annotation\Attributes' => [
+        'Doctrine\Annotations\Annotation\Attributes' => [
             'is_annotation'    => true,
             'has_constructor'  => false,
             'targets_literal'  => 'ANNOTATION_CLASS',
@@ -196,12 +196,12 @@ final class DocParser
                 'value' => [
                     'type'      =>'array',
                     'required'  =>true,
-                    'array_type'=>'Doctrine\Common\Annotations\Annotation\Attribute',
-                    'value'     =>'array<Doctrine\Common\Annotations\Annotation\Attribute>'
+                    'array_type'=>'Doctrine\Annotations\Annotation\Attribute',
+                    'value'     =>'array<Doctrine\Annotations\Annotation\Attribute>'
                 ]
              ],
         ],
-        'Doctrine\Common\Annotations\Annotation\Enum' => [
+        'Doctrine\Annotations\Annotation\Enum' => [
             'is_annotation'    => true,
             'has_constructor'  => true,
             'targets_literal'  => 'ANNOTATION_PROPERTY',
@@ -484,10 +484,10 @@ private function collectAnnotationMetadata($name)
             self::$metadataParser->setIgnoreNotImportedAnnotations(true);
             self::$metadataParser->setIgnoredAnnotationNames($this->ignoredAnnotationNames);
             self::$metadataParser->setImports([
-                'enum'          => 'Doctrine\Common\Annotations\Annotation\Enum',
-                'target'        => 'Doctrine\Common\Annotations\Annotation\Target',
-                'attribute'     => 'Doctrine\Common\Annotations\Annotation\Attribute',
-                'attributes'    => 'Doctrine\Common\Annotations\Annotation\Attributes'
+                'enum'          => 'Doctrine\Annotations\Annotation\Enum',
+                'target'        => 'Doctrine\Annotations\Annotation\Target',
+                'attribute'     => 'Doctrine\Annotations\Annotation\Attribute',
+                'attributes'    => 'Doctrine\Annotations\Annotation\Attributes'
             ]);
 
             AnnotationRegistry::registerFile(__DIR__ . '/Annotation/Enum.php');

lib/Doctrine/Common/Annotations/FileCacheReader.php → lib/Doctrine/Annotations/FileCacheReader.php

@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations;
+namespace Doctrine\Annotations;
 
 /**
  * File cache reader for annotations.
@@ -27,7 +27,7 @@
  *
  * @deprecated the FileCacheReader is deprecated and will be removed
  *             in version 2.0.0 of doctrine/annotations. Please use the
- *             {@see \Doctrine\Common\Annotations\CachedReader} instead.
+ *             {@see \Doctrine\Annotations\CachedReader} instead.
  */
 class FileCacheReader implements Reader
 {

lib/Doctrine/Common/Annotations/IndexedReader.php → lib/Doctrine/Annotations/IndexedReader.php

@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations;
+namespace Doctrine\Annotations;
 
 /**
  * Allows the reader to be used in-place of Doctrine's reader.

lib/Doctrine/Common/Annotations/PhpParser.php → lib/Doctrine/Annotations/PhpParser.php

@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations;
+namespace Doctrine\Annotations;
 
 use SplFileObject;
 

lib/Doctrine/Common/Annotations/Reader.php → lib/Doctrine/Annotations/Reader.php

@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations;
+namespace Doctrine\Annotations;
 
 /**
  * Interface for annotation readers.

lib/Doctrine/Common/Annotations/SimpleAnnotationReader.php → lib/Doctrine/Annotations/SimpleAnnotationReader.php

@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations;
+namespace Doctrine\Annotations;
 
 /**
  * Simple Annotation Reader.

lib/Doctrine/Common/Annotations/TokenParser.php → lib/Doctrine/Annotations/TokenParser.php

@@ -17,7 +17,7 @@
  * <http://www.doctrine-project.org>.
  */
 
-namespace Doctrine\Common\Annotations;
+namespace Doctrine\Annotations;
 
 /**
  * Parses a file for namespaces/use/class declarations.