Skip to content

Commit 4ec0019

Browse files
weaverryanweaverryan
committed
minor #8593 Migrating to Symfony Flex structure (yceruto)
This PR was merged into the master branch. Discussion ---------- Migrating to Symfony Flex structure Other bunch of automatic changes related to namespace, path and config files. Note: Still I've excluded some files that may need a full refactor. Commits ------- 6eedb0f Migrating to Symfony Flex structure
2 parents 28046da + 6eedb0f commit 4ec0019

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+704
-699
lines changed

‎_includes/service_container/_my_mailer.rst.inc‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
.. code-block:: yaml
44

5-
# app/config/services.yml
5+
# config/services.yaml
66
services:
77
app.mailer:
8-
class: AppBundle\Mailer
8+
class: App\Mailer
99
arguments: [sendmail]
1010

1111
.. code-block:: xml
@@ -18,16 +18,16 @@
1818
http://symfony.com/schema/dic/services/services-1.0.xsd">
1919

2020
<services>
21-
<service id="app.mailer" class="AppBundle\Mailer">
21+
<service id="app.mailer" class="App\Mailer">
2222
<argument>sendmail</argument>
2323
</service>
2424
</services>
2525
</container>
2626

2727
.. code-block:: php
2828

29-
// app/config/services.php
30-
use AppBundle\Mailer;
29+
// config/services.php
30+
use App\Mailer;
3131

3232
$container->register('app.mailer', Mailer::class)
3333
->addArgument('sendmail');

‎best_practices/configuration.rst‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,8 @@ option for a value that you are never going to configure just isn't necessary.
109109
Our recommendation is to define these values as constants in your application.
110110
You could, for example, define a ``NUM_ITEMS`` constant in the ``Post`` entity::
111111

112-
// src/AppBundle/Entity/Post.php
113-
namespace AppBundle\Entity;
112+
// src/Entity/Post.php
113+
namespace App\Entity;
114114

115115
class Post
116116
{
@@ -137,10 +137,10 @@ whereas they cannot access the container parameters:
137137

138138
.. code-block:: php
139139
140-
namespace AppBundle\Repository;
140+
namespace App\Repository;
141141
142+
use App\Entity\Post;
142143
use Doctrine\ORM\EntityRepository;
143-
use AppBundle\Entity\Post;
144144
145145
class PostRepository extends EntityRepository
146146
{

‎best_practices/templates.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ Then, create a new ``Markdown`` class that will be used later by the Twig
7575
extension. It just needs to define one single method to transform
7676
Markdown content into HTML::
7777

78-
namespace AppBundle\Utils;
78+
namespace App\Utils;
7979

8080
class Markdown
8181
{
@@ -100,9 +100,9 @@ class in the constructor of the Twig extension:
100100

101101
.. code-block:: php
102102
103-
namespace AppBundle\Twig;
103+
namespace App\Twig;
104104
105-
use AppBundle\Utils\Markdown;
105+
use App\Utils\Markdown;
106106
107107
class AppExtension extends \Twig_Extension
108108
{

‎controller/service.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ Invokable Controllers
8383

8484
If your controller implements the ``__invoke()`` method - popular with the
8585
Action-Domain-Response (ADR) pattern, you can simply refer to the service id
86-
(``AppBundle\Controller\HelloController`` or ``app.hello_controller`` for example).
86+
(``App\Controller\HelloController`` or ``app.hello_controller`` for example).
8787

8888
Alternatives to base Controller Methods
8989
---------------------------------------

‎doctrine.rst‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ Creating an Entity Class
247247
Suppose you're building an application where products need to be displayed.
248248
Without even thinking about Doctrine or databases, you already know that
249249
you need a ``Product`` object to represent those products. Create this class
250-
inside the ``Entity`` directory of your AppBundle::
250+
inside the ``Entity`` directory of your ``src``::
251251

252252
// src/Entity/Product.php
253253
namespace App\Entity;
@@ -617,8 +617,8 @@ repository object for an entity class via::
617617

618618
.. note::
619619

620-
You can also use ``AppBundle:Product`` syntax. This string is a shortcut you can use anywhere
621-
in Doctrine instead of the full class name of the entity (i.e. ``AppBundle\Entity\Product``).
620+
You can also use ``App:Product`` syntax. This string is a shortcut you can use anywhere
621+
in Doctrine instead of the full class name of the entity (i.e. ``App\Entity\Product``).
622622
As long as your entity lives under the ``Entity`` namespace of your bundle,
623623
this will work.
624624

@@ -754,7 +754,7 @@ SQL-like language, to construct a query for this scenario::
754754

755755
$query = $em->createQuery(
756756
'SELECT p
757-
FROM AppBundle:Product p
757+
FROM App:Product p
758758
WHERE p.price > :price
759759
ORDER BY p.price ASC'
760760
)->setParameter('price', 19.99);
@@ -764,8 +764,8 @@ SQL-like language, to construct a query for this scenario::
764764
If you're comfortable with SQL, then DQL should feel very natural. The biggest
765765
difference is that you need to think in terms of selecting PHP objects,
766766
instead of rows in a database. For this reason, you select *from* the
767-
``AppBundle:Product`` *entity* (an optional shortcut for the
768-
``AppBundle\Entity\Product`` class) and then alias it as ``p``.
767+
``App:Product`` *entity* (an optional shortcut for the
768+
``App\Entity\Product`` class) and then alias it as ``p``.
769769

770770
.. tip::
771771

@@ -794,7 +794,7 @@ DQL as you start to concatenate strings::
794794
$repository = $this->getDoctrine()
795795
->getRepository(Product::class);
796796

797-
// createQueryBuilder() automatically selects FROM AppBundle:Product
797+
// createQueryBuilder() automatically selects FROM App:Product
798798
// and aliases it to "p"
799799
$query = $repository->createQueryBuilder('p')
800800
->where('p.price > :price')

‎forms.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -632,7 +632,7 @@ the choice is ultimately up to you.
632632
.. sidebar:: Setting the ``data_class``
633633

634634
Every form needs to know the name of the class that holds the underlying
635-
data (e.g. ``AppBundle\Entity\Task``). Usually, this is just guessed
635+
data (e.g. ``App\Entity\Task``). Usually, this is just guessed
636636
based off of the object passed to the second argument to ``createForm()``
637637
(i.e. ``$task``). Later, when you begin embedding forms, this will no
638638
longer be sufficient. So, while not always necessary, it's generally a

‎reference/constraints/All.rst‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ entry in that array:
2525

2626
.. code-block:: php-annotations
2727
28-
// src/AppBundle/Entity/User.php
29-
namespace AppBundle\Entity;
28+
// src/Entity/User.php
29+
namespace App\Entity;
3030
3131
use Symfony\Component\Validator\Constraints as Assert;
3232
@@ -43,8 +43,8 @@ entry in that array:
4343
4444
.. code-block:: yaml
4545
46-
# src/AppBundle/Resources/config/validation.yml
47-
AppBundle\Entity\User:
46+
# src/Resources/config/validation.yml
47+
App\Entity\User:
4848
properties:
4949
favoriteColors:
5050
- All:
@@ -54,13 +54,13 @@ entry in that array:
5454
5555
.. code-block:: xml
5656
57-
<!-- src/AppBundle/Resources/config/validation.xml -->
57+
<!-- src/Resources/config/validation.xml -->
5858
<?xml version="1.0" encoding="UTF-8" ?>
5959
<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
6060
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6161
xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
6262
63-
<class name="AppBundle\Entity\User">
63+
<class name="App\Entity\User">
6464
<property name="favoriteColors">
6565
<constraint name="All">
6666
<option name="constraints">
@@ -76,8 +76,8 @@ entry in that array:
7676
7777
.. code-block:: php
7878
79-
// src/AppBundle/Entity/User.php
80-
namespace AppBundle\Entity;
79+
// src/Entity/User.php
80+
namespace App\Entity;
8181
8282
use Symfony\Component\Validator\Mapping\ClassMetadata;
8383
use Symfony\Component\Validator\Constraints as Assert;

‎reference/constraints/Bic.rst‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,8 @@ will contain a Business Identifier Code (BIC).
2626

2727
.. code-block:: php-annotations
2828
29-
// src/AppBundle/Entity/Transaction.php
30-
namespace AppBundle\Entity;
29+
// src/Entity/Transaction.php
30+
namespace App\Entity;
3131
3232
use Symfony\Component\Validator\Constraints as Assert;
3333
@@ -41,21 +41,21 @@ will contain a Business Identifier Code (BIC).
4141
4242
.. code-block:: yaml
4343
44-
# src/AppBundle/Resources/config/validation.yml
45-
AppBundle\Entity\Transaction:
44+
# src/Resources/config/validation.yml
45+
App\Entity\Transaction:
4646
properties:
4747
businessIdentifierCode:
4848
- Bic: ~
4949
5050
.. code-block:: xml
5151
52-
<!-- src/AppBundle/Resources/config/validation.xml -->
52+
<!-- src/Resources/config/validation.xml -->
5353
<?xml version="1.0" encoding="UTF-8" ?>
5454
<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
5555
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
5656
xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
5757
58-
<class name="AppBundle\Entity\Transaction">
58+
<class name="App\Entity\Transaction">
5959
<property name="businessIdentifierCode">
6060
<constraint name="Bic" />
6161
</property>
@@ -64,8 +64,8 @@ will contain a Business Identifier Code (BIC).
6464
6565
.. code-block:: php
6666
67-
// src/AppBundle/Entity/Transaction.php
68-
namespace AppBundle\Entity;
67+
// src/Entity/Transaction.php
68+
namespace App\Entity;
6969
7070
use Symfony\Component\Validator\Mapping\ClassMetadata;
7171
use Symfony\Component\Validator\Constraints as Assert;

‎reference/constraints/Blank.rst‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ of an ``Author`` class were blank, you could do the following:
3535

3636
.. code-block:: php-annotations
3737
38-
// src/AppBundle/Entity/Author.php
39-
namespace AppBundle\Entity;
38+
// src/Entity/Author.php
39+
namespace App\Entity;
4040
4141
use Symfony\Component\Validator\Constraints as Assert;
4242
@@ -50,21 +50,21 @@ of an ``Author`` class were blank, you could do the following:
5050
5151
.. code-block:: yaml
5252
53-
# src/AppBundle/Resources/config/validation.yml
54-
AppBundle\Entity\Author:
53+
# src/Resources/config/validation.yml
54+
App\Entity\Author:
5555
properties:
5656
firstName:
5757
- Blank: ~
5858
5959
.. code-block:: xml
6060
61-
<!-- src/AppBundle/Resources/config/validation.xml -->
61+
<!-- src/Resources/config/validation.xml -->
6262
<?xml version="1.0" encoding="UTF-8" ?>
6363
<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
6464
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6565
xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
6666
67-
<class name="AppBundle\Entity\Author">
67+
<class name="App\Entity\Author">
6868
<property name="firstName">
6969
<constraint name="Blank" />
7070
</property>
@@ -73,8 +73,8 @@ of an ``Author`` class were blank, you could do the following:
7373
7474
.. code-block:: php
7575
76-
// src/AppBundle/Entity/Author.php
77-
namespace AppBundle\Entity;
76+
// src/Entity/Author.php
77+
namespace App\Entity;
7878
7979
use Symfony\Component\Validator\Mapping\ClassMetadata;
8080
use Symfony\Component\Validator\Constraints as Assert;

‎reference/constraints/Callback.rst‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ Configuration
3535

3636
.. code-block:: php-annotations
3737
38-
// src/AppBundle/Entity/Author.php
39-
namespace AppBundle\Entity;
38+
// src/Entity/Author.php
39+
namespace App\Entity;
4040
4141
use Symfony\Component\Validator\Constraints as Assert;
4242
use Symfony\Component\Validator\Context\ExecutionContextInterface;
@@ -54,28 +54,28 @@ Configuration
5454
5555
.. code-block:: yaml
5656
57-
# src/AppBundle/Resources/config/validation.yml
58-
AppBundle\Entity\Author:
57+
# src/Resources/config/validation.yml
58+
App\Entity\Author:
5959
constraints:
6060
- Callback: validate
6161
6262
.. code-block:: xml
6363
64-
<!-- src/AppBundle/Resources/config/validation.xml -->
64+
<!-- src/Resources/config/validation.xml -->
6565
<?xml version="1.0" encoding="UTF-8" ?>
6666
<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
6767
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6868
xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
6969
70-
<class name="AppBundle\Entity\Author">
70+
<class name="App\Entity\Author">
7171
<constraint name="Callback">validate</constraint>
7272
</class>
7373
</constraint-mapping>
7474
7575
.. code-block:: php
7676
77-
// src/AppBundle/Entity/Author.php
78-
namespace AppBundle\Entity;
77+
// src/Entity/Author.php
78+
namespace App\Entity;
7979
8080
use Symfony\Component\Validator\Mapping\ClassMetadata;
8181
use Symfony\Component\Validator\Constraints as Assert;
@@ -163,8 +163,8 @@ You can then use the following configuration to invoke this validator:
163163

164164
.. code-block:: php-annotations
165165
166-
// src/AppBundle/Entity/Author.php
167-
namespace AppBundle\Entity;
166+
// src/Entity/Author.php
167+
namespace App\Entity;
168168
169169
use Symfony\Component\Validator\Constraints as Assert;
170170
@@ -177,20 +177,20 @@ You can then use the following configuration to invoke this validator:
177177
178178
.. code-block:: yaml
179179
180-
# src/AppBundle/Resources/config/validation.yml
181-
AppBundle\Entity\Author:
180+
# src/Resources/config/validation.yml
181+
App\Entity\Author:
182182
constraints:
183183
- Callback: [Acme\Validator, validate]
184184
185185
.. code-block:: xml
186186
187-
<!-- src/AppBundle/Resources/config/validation.xml -->
187+
<!-- src/Resources/config/validation.xml -->
188188
<?xml version="1.0" encoding="UTF-8" ?>
189189
<constraint-mapping xmlns="http://symfony.com/schema/dic/constraint-mapping"
190190
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
191191
xsi:schemaLocation="http://symfony.com/schema/dic/constraint-mapping http://symfony.com/schema/dic/constraint-mapping/constraint-mapping-1.0.xsd">
192192
193-
<class name="AppBundle\Entity\Author">
193+
<class name="App\Entity\Author">
194194
<constraint name="Callback">
195195
<value>Acme\Validator</value>
196196
<value>validate</value>
@@ -200,8 +200,8 @@ You can then use the following configuration to invoke this validator:
200200
201201
.. code-block:: php
202202
203-
// src/AppBundle/Entity/Author.php
204-
namespace AppBundle\Entity;
203+
// src/Entity/Author.php
204+
namespace App\Entity;
205205
206206
use Acme\Validator;
207207
use Symfony\Component\Validator\Mapping\ClassMetadata;
@@ -229,8 +229,8 @@ You can then use the following configuration to invoke this validator:
229229
When configuring the constraint via PHP, you can also pass a closure to the
230230
constructor of the Callback constraint::
231231

232-
// src/AppBundle/Entity/Author.php
233-
namespace AppBundle\Entity;
232+
// src/Entity/Author.php
233+
namespace App\Entity;
234234

235235
use Symfony\Component\Validator\Context\ExecutionContextInterface;
236236

0 commit comments

Comments
 (0)