Skip to content
This repository was archived by the owner on Sep 16, 2021. It is now read-only.

Commit 3651129

Browse files
authored
Merge pull request #771 from symfony-cmf/sf3
Use Symfony 3 directory structure
2 parents 0a33aa8 + c69a17d commit 3651129

14 files changed

+49
-49
lines changed

book/installation.rst

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ and then get the Symfony CMF code with it (this may take a while):
7272

7373
This will clone the Standard Edition and install all the dependencies and run
7474
some initial commands. These commands require write permissions to the
75-
``app/cache`` and ``app/logs`` directory. In case the final commands end up
75+
``var/cache`` and ``var/logs`` directory. In case the final commands end up
7676
giving permissions errors, please follow the `guidelines in the Symfony Book`_
7777
to configure the permissions and then run the ``install`` command:
7878

@@ -115,10 +115,10 @@ database backend just go ahead and run the following:
115115

116116
.. code-block:: bash
117117
118-
$ php app/console doctrine:database:create
119-
$ php app/console doctrine:phpcr:init:dbal --force
120-
$ php app/console doctrine:phpcr:repository:init
121-
$ php app/console doctrine:phpcr:fixtures:load
118+
$ php bin/console doctrine:database:create
119+
$ php bin/console doctrine:phpcr:init:dbal --force
120+
$ php bin/console doctrine:phpcr:repository:init
121+
$ php bin/console doctrine:phpcr:fixtures:load
122122
123123
The first command will create a file called ``app.sqlite`` inside your app
124124
folder, containing the database content. The two commands after it will setup
@@ -133,7 +133,7 @@ to dump the assets to the filesystem:
133133

134134
.. code-block:: bash
135135
136-
$ php app/console --env=prod assetic:dump
136+
$ php bin/console --env=prod assetic:dump
137137
138138
Configure a Webserver
139139
~~~~~~~~~~~~~~~~~~~~~
@@ -143,7 +143,7 @@ installed you can alternatively use the PHP internal web server:
143143

144144
.. code-block:: bash
145145
146-
$ php app/console server:run
146+
$ php bin/console server:run
147147
148148
And then access the CMF via:
149149

@@ -234,9 +234,9 @@ following commands:
234234

235235
.. code-block:: bash
236236
237-
$ php app/console doctrine:phpcr:node:dump
238-
$ php app/console doctrine:phpcr:node:dump --props
239-
$ php app/console doctrine:phpcr:node:dump /path/to/node
237+
$ php bin/console doctrine:phpcr:node:dump
238+
$ php bin/console doctrine:phpcr:node:dump --props
239+
$ php bin/console doctrine:phpcr:node:dump /path/to/node
240240
241241
The above examples respectively show a summary, a detailed view, and a summary
242242
of a node and all its children (instead of starting at the root node).
@@ -245,7 +245,7 @@ Don't forget to look at the ``--help`` output for more possibilities:
245245

246246
.. code-block:: bash
247247
248-
$ php app/console doctrine:phpcr:node:dump --help
248+
$ php bin/console doctrine:phpcr:node:dump --help
249249
250250
Adding new pages
251251
~~~~~~~~~~~~~~~~
@@ -270,7 +270,7 @@ The contents of this file can be loaded into the PHPCR database by calling:
270270

271271
.. code-block:: bash
272272
273-
$ php app/console doctrine:phpcr:migrator:migrate page --identifier=/cms/simple/test
273+
$ php bin/console doctrine:phpcr:migrator:migrate page --identifier=/cms/simple/test
274274
275275
Note that the above identifier is mapped to
276276
``app/Resources/data/pages/test.yml`` by stripping off the ``basepath``
@@ -282,7 +282,7 @@ and then run the following command:
282282

283283
.. code-block:: bash
284284
285-
$ php app/console doctrine:phpcr:migrator:migrate page --identifier=/cms/simple/test/foo
285+
$ php bin/console doctrine:phpcr:migrator:migrate page --identifier=/cms/simple/test/foo
286286
287287
.. _`cmf.liip.ch`: http://cmf.liip.ch
288288
.. _`Requirements for running Symfony2`: https://symfony.com/doc/current/reference/requirements.html

bundles/create/developing-hallo.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ in the symfony console:
1111

1212
.. code-block:: bash
1313
14-
$ php app/console cmf:create:init-hallo-devel
14+
$ php bin/console cmf:create:init-hallo-devel
1515
1616
The CreateBundle provides a special template that loads the coffeescript files.
1717
To use this template, specify ``hallo-coffee`` as editor in the

bundles/create/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ found:
233233

234234
.. code-block:: bash
235235
236-
$ php app/console --env=prod assetic:dump
236+
$ php bin/console --env=prod assetic:dump
237237
238238
Routing
239239
~~~~~~~

bundles/phpcr_odm/fixtures_initializers.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ You can execute your Initializers using the following command:
9191

9292
.. code-block:: bash
9393
94-
$ php app/console doctrine:phpcr:repository:init
94+
$ php bin/console doctrine:phpcr:repository:init
9595
9696
.. versionadded:: 1.1
9797
Since DoctrinePHPCRBundle 1.1 the load data fixtures command will
@@ -259,7 +259,7 @@ To find out available migrations run:
259259

260260
.. code-block:: bash
261261
262-
$ php app/console doctrine:phpcr:migrator:migrate
262+
$ php bin/console doctrine:phpcr:migrator:migrate
263263
264264
Then pass in the name of the migrator to run it, optionally passing in an
265265
``--identifier``, ``--depth`` or ``--session`` argument. The later argument

bundles/phpcr_odm/introduction.rst

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -233,8 +233,8 @@ Now make sure the database exists and initialize it:
233233
.. code-block:: bash
234234
235235
# without Doctrine ORM
236-
php app/console doctrine:database:create
237-
php app/console doctrine:phpcr:init:dbal
236+
php bin/console doctrine:database:create
237+
php bin/console doctrine:phpcr:init:dbal
238238
239239
.. tip::
240240

@@ -257,8 +257,8 @@ so that you can create migrations.
257257
.. code-block:: bash
258258
259259
# Using Doctrine ORM
260-
php app/console doctrine:database:create
261-
php app/console doctrine:schema:create
260+
php bin/console doctrine:database:create
261+
php bin/console doctrine:schema:create
262262
263263
.. note::
264264

@@ -328,7 +328,7 @@ bundles:
328328

329329
.. code-block:: bash
330330
331-
$ php app/console doctrine:phpcr:repository:init
331+
$ php bin/console doctrine:phpcr:repository:init
332332
333333
You only need to run this command once when you created a new repository. (But
334334
nothing goes wrong if you run it on each deployment for example.)
@@ -422,7 +422,7 @@ PHPCR sessions.
422422
Some of these commands are specific to a backend or to the ODM. Those commands
423423
will only be available if such a backend is configured.
424424

425-
Use ``app/console help <command>`` to see all options each of the commands
425+
Use ``php bin/console help <command>`` to see all options each of the commands
426426
has.
427427

428428
* **doctrine:phpcr:document:migrate-class**: Command to migrate document classes;
@@ -462,13 +462,13 @@ Running `SQL2 queries`_ against the repository:
462462

463463
.. code-block:: bash
464464
465-
$ php app/console doctrine:phpcr:workspace:query "SELECT title FROM [nt:unstructured] WHERE NAME() = 'home'"
465+
$ php bin/console doctrine:phpcr:workspace:query "SELECT title FROM [nt:unstructured] WHERE NAME() = 'home'"
466466
467467
Dumping nodes under ``/cms/simple`` including their properties:
468468

469469
.. code-block:: bash
470470
471-
$ php app/console doctrine:phpcr:node:dump /cms/simple --props
471+
$ php bin/console doctrine:phpcr:node:dump /cms/simple --props
472472
473473
.. _phpcr-odm-backup-restore:
474474

@@ -479,7 +479,7 @@ To export all repository data into a file, you can use:
479479

480480
.. code-block:: bash
481481
482-
$ php app/console doctrine:phpcr:workspace:export --path /cms /path/to/backup.xml
482+
$ php bin/console doctrine:phpcr:workspace:export --path /cms /path/to/backup.xml
483483
484484
.. note::
485485

@@ -491,7 +491,7 @@ To restore this backup you can run:
491491

492492
.. code-block:: bash
493493
494-
$ php app/console doctrine:phpcr:workspace:import /path/to/backup.xml
494+
$ php bin/console doctrine:phpcr:workspace:import /path/to/backup.xml
495495
496496
Note that you can also export and import parts of your repository by choosing a
497497
different path on export and specifying the ``--parentpath`` option to the
@@ -502,7 +502,7 @@ remove the target node first:
502502

503503
.. code-block:: bash
504504
505-
$ php app/console doctrine:phpcr:node:remove /cms
505+
$ php bin/console doctrine:phpcr:node:remove /cms
506506
507507
Read On
508508
-------

cookbook/editions/cmf_sandbox.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ run:
115115

116116
.. code-block:: bash
117117
118-
$ php app/console doctrine:database:create
118+
$ php bin/console doctrine:database:create
119119
120120
If you don't have sqlite, you can specify ``pdo_mysql`` or ``pdo_pgsql`` and
121121
provide the database name and login credentials to use.
@@ -124,14 +124,14 @@ Then you have to set up your database with:
124124

125125
.. code-block:: bash
126126
127-
$ php app/console doctrine:phpcr:init:dbal
127+
$ php bin/console doctrine:phpcr:init:dbal
128128
129129
Once your database is set up, you need to `register the node types`_ for
130130
phpcr-odm:
131131

132132
.. code-block:: bash
133133
134-
$ php app/console doctrine:phpcr:repository:init
134+
$ php bin/console doctrine:phpcr:repository:init
135135
136136
Import the Fixtures
137137
~~~~~~~~~~~~~~~~~~~
@@ -141,7 +141,7 @@ They are loaded using the fixture loading concept of PHPCR-ODM.
141141

142142
.. code-block:: bash
143143
144-
$ php app/console -v doctrine:phpcr:fixtures:load
144+
$ php bin/console -v doctrine:phpcr:fixtures:load
145145
146146
This command loads fixtures from all bundles that provide them in the
147147
``DataFixtures/PHPCR`` folder. The sandbox has fixtures in the
@@ -162,8 +162,8 @@ doctrine proxies and dump the Assetic assets:
162162

163163
.. code-block:: text
164164
165-
$ php app/console cache:clear --env=prod --no-debug
166-
$ php app/console assetic:dump --env=prod --no-debug
165+
$ php bin/console cache:clear --env=prod --no-debug
166+
$ php bin/console assetic:dump --env=prod --no-debug
167167
168168
.. _`Composer`: https://getcomposer.org
169169
.. _`CMF sandbox github repository`: https://github.com/symfony-cmf/cmf-sandbox

quick_tour/the_big_picture.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,10 +68,10 @@ extension. After that, run these commands:
6868

6969
.. code-block:: bash
7070
71-
$ php app/console doctrine:database:create
72-
$ php app/console doctrine:phpcr:init:dbal
73-
$ php app/console doctrine:phpcr:repository:init
74-
$ php app/console doctrine:phpcr:fixtures:load
71+
$ php bin/console doctrine:database:create
72+
$ php bin/console doctrine:phpcr:init:dbal
73+
$ php bin/console doctrine:phpcr:repository:init
74+
$ php bin/console doctrine:phpcr:fixtures:load
7575
7676
.. tip::
7777

quick_tour/the_model.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ following command:
2929

3030
.. code-block:: bash
3131
32-
$ php app/console doctrine:phpcr:node:dump
32+
$ php bin/console doctrine:phpcr:node:dump
3333
3434
The result will be the PHPCR tree:
3535

tutorial/auto-routing.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,13 +216,13 @@ Now reload the fixtures:
216216

217217
.. code-block:: bash
218218
219-
$ php app/console doctrine:phpcr:fixtures:load
219+
$ php bin/console doctrine:phpcr:fixtures:load
220220
221221
Have a look at what you have:
222222

223223
.. code-block:: bash
224224
225-
$ php app/console doctrine:phpcr:node:dump
225+
$ php bin/console doctrine:phpcr:node:dump
226226
ROOT:
227227
cms:
228228
pages:

tutorial/content-to-controllers.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ And clear your cache:
3636

3737
.. code-block:: bash
3838
39-
$ php app/console cache:clear
39+
$ php bin/console cache:clear
4040
4141
Now you can call the method ``getRoutes`` on either ``Page`` or ``Post`` and retrieve all the
4242
routes which refer to that document ... pretty cool!

tutorial/getting-started.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ you will need to create the database:
5454

5555
.. code-block:: bash
5656
57-
$ php app/console doctrine:database:create
57+
$ php bin/console doctrine:database:create
5858
5959
This will create a new database according to the configuration file
6060
``parameters.yml``.

tutorial/make-homepage.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,14 +198,14 @@ Now empty your repository, reinitialize it and reload your fixtures:
198198

199199
.. code-block:: bash
200200
201-
$ php app/console doctrine:phpcr:fixtures:load
201+
$ php bin/console doctrine:phpcr:fixtures:load
202202
203203
and verify that the ``cms`` node has been created correctly, using the
204204
``doctrine:phpcr:node:dump`` command with the ``props`` flag:
205205

206206
.. code-block:: bash
207207
208-
$ php app/console doctrine:phpcr:node:dump --props
208+
$ php bin/console doctrine:phpcr:node:dump --props
209209
ROOT:
210210
cms:
211211
- jcr:primaryType = nt:unstructured

tutorial/sonata-admin.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,13 +136,13 @@ and publish your assets (remove ``--symlink`` if you use Windows!):
136136

137137
.. code-block:: bash
138138
139-
$ php app/console assets:install --symlink web/
139+
$ php bin/console assets:install --symlink web/
140140
141141
Now start a local webserver:
142142

143143
.. code-block:: bash
144144
145-
$ php app/console server:run
145+
$ php bin/console server:run
146146
147147
148148
That works? Great, now have a look at http://127.0.0.1:8000/admin/dashboard
@@ -480,7 +480,7 @@ Now publish your assets again:
480480

481481
.. code-block:: bash
482482
483-
$ php app/console assets:install --symlink web/
483+
$ php bin/console assets:install --symlink web/
484484
485485
Routes used by the tree in the frontend are handled by the FOSJsRoutingBundle.
486486
The relevant routes are tagged with the ``expose`` flag, they are available

tutorial/the-frontend.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ Load the fixtures again:
170170

171171
.. code-block:: bash
172172
173-
$ php app/console doctrine:phpcr:fixtures:load
173+
$ php bin/console doctrine:phpcr:fixtures:load
174174
175175
Register the Menu Provider
176176
--------------------------

0 commit comments

Comments
 (0)