From bf291252203000f80cd74a79ed8f0b3634b6d11b Mon Sep 17 00:00:00 2001
From: Fabien Potencier <fabien.potencier@gmail.com>
Date: Thu, 14 Sep 2017 21:26:22 -0700
Subject: [PATCH] changed the way we register annotations

---
 .../{3.0 => 4.0}/config/packages/framework_extra.yaml          | 0
 sensio/framework-extra-bundle/{3.0 => 4.0}/manifest.json       | 3 ++-
 symfony/annotations-pack/1.0/manifest.json                     | 3 ---
 symfony/routing/3.3/config/routes.yaml                         | 3 +--
 4 files changed, 3 insertions(+), 6 deletions(-)
 rename sensio/framework-extra-bundle/{3.0 => 4.0}/config/packages/framework_extra.yaml (100%)
 rename sensio/framework-extra-bundle/{3.0 => 4.0}/manifest.json (70%)
 delete mode 100644 symfony/annotations-pack/1.0/manifest.json

diff --git a/sensio/framework-extra-bundle/3.0/config/packages/framework_extra.yaml b/sensio/framework-extra-bundle/4.0/config/packages/framework_extra.yaml
similarity index 100%
rename from sensio/framework-extra-bundle/3.0/config/packages/framework_extra.yaml
rename to sensio/framework-extra-bundle/4.0/config/packages/framework_extra.yaml
diff --git a/sensio/framework-extra-bundle/3.0/manifest.json b/sensio/framework-extra-bundle/4.0/manifest.json
similarity index 70%
rename from sensio/framework-extra-bundle/3.0/manifest.json
rename to sensio/framework-extra-bundle/4.0/manifest.json
index dbf63474..dc263ba2 100644
--- a/sensio/framework-extra-bundle/3.0/manifest.json
+++ b/sensio/framework-extra-bundle/4.0/manifest.json
@@ -4,5 +4,6 @@
     },
     "copy-from-recipe": {
         "config/": "%CONFIG_DIR%/"
-    }
+    },
+    "aliases": ["annotations", "annotation", "annot", "annots"]
 }
diff --git a/symfony/annotations-pack/1.0/manifest.json b/symfony/annotations-pack/1.0/manifest.json
deleted file mode 100644
index 85477d4c..00000000
--- a/symfony/annotations-pack/1.0/manifest.json
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-    "aliases": ["annotations", "annotation", "annot", "annots"]
-}
diff --git a/symfony/routing/3.3/config/routes.yaml b/symfony/routing/3.3/config/routes.yaml
index 7fb6dd3e..e00f7e9a 100644
--- a/symfony/routing/3.3/config/routes.yaml
+++ b/symfony/routing/3.3/config/routes.yaml
@@ -2,8 +2,7 @@
 #    path: /
 #    defaults: { _controller: 'App\Controller\DefaultController::index' }
 
-# Depends on sensio/framework-extra-bundle, doctrine/annotations, and doctrine/cache
-#   install with composer req sensio/framework-extra-bundle annot
+# first, run composer req annotations
 #controllers:
 #    resource: ../src/Controller/
 #    type: annotation