Merge pull request #81 from symfony/quick-fixes

orbitale/cms-bundle/2.0/etc/routing/orbitale_cms.yaml

@@ -1,9 +0,0 @@
-orbitale_cms_category:
-    resource: "@OrbitaleCmsBundle/Controller/CategoryController.php"
-    type:     annotation
-    prefix:   /category/
-
-orbitale_cms_page:
-    resource: "@OrbitaleCmsBundle/Controller/PageController.php"
-    type:     annotation
-    prefix:   /page/

orbitale/cms-bundle/2.0/manifest.json

@@ -1,9 +0,0 @@
-{
-    "bundles": {
-        "Orbitale\\Bundle\\CmsBundle\\OrbitaleCmsBundle": ["all"]
-    },
-    "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/",
-        "src/": "%SRC_DIR%/"
-    }
-}

orbitale/cms-bundle/2.0/src/Entity/Category.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Entity;
-
-use Orbitale\Bundle\CmsBundle\Entity\Category as BaseCategory;
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * @ORM\Entity(repositoryClass="Orbitale\Bundle\CmsBundle\Repository\CategoryRepository")
- * @ORM\Table(name="orbitale_cms_categories")
- */
-class Category extends BaseCategory
-{
-    /**
-     * @var int
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    protected $id;
-
-    /**
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-}

orbitale/cms-bundle/2.0/src/Entity/Page.php

@@ -1,29 +0,0 @@
-<?php
-
-namespace App\Entity;
-
-use Orbitale\Bundle\CmsBundle\Entity\Page as BasePage;
-use Doctrine\ORM\Mapping as ORM;
-
-/**
- * @ORM\Entity(repositoryClass="Orbitale\Bundle\CmsBundle\Repository\PageRepository")
- * @ORM\Table(name="orbitale_cms_pages")
- */
-class Page extends BasePage
-{
-    /**
-     * @var int
-     * @ORM\Column(name="id", type="integer")
-     * @ORM\Id
-     * @ORM\GeneratedValue(strategy="AUTO")
-     */
-    protected $id;
-
-    /**
-     * @return int
-     */
-    public function getId()
-    {
-        return $this->id;
-    }
-}

orbitale/cms-bundle/3.0/etc/packages/orbitale_cms.yaml

@@ -1,6 +0,0 @@
-orbitale_cms:
-    page_class: App\Entity\Page
-    category_class: App\Entity\Category
-# Define your layout here if you need a custom layout for your CMS
-#    layouts:
-#         main: { resource: base.html.twig }

orbitale/cms-bundle/3.0/manifest.json

@@ -3,7 +3,7 @@
         "Orbitale\\Bundle\\CmsBundle\\OrbitaleCmsBundle": ["all"]
     },
     "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/",
+        "config/": "%CONFIG_DIR%/",
         "src/": "%SRC_DIR%/"
     }
 }

willdurand/geocoder-bundle/4.1/manifest.json

@@ -1,8 +1,8 @@
 {
     "bundles": {
-        "Bazinga\\Bundle\\GeocoderBundle\\BazingaGeocoderBundle": ["all"]
+        "Bazinga\\GeocoderBundle\\BazingaGeocoderBundle": ["all"]
     },
     "copy-from-recipe": {
-        "etc/": "%ETC_DIR%/"
+        "config/": "%CONFIG_DIR%/"
     }
 }