Skip to content

Commit b032584

Browse files
committed
Merge branch '2.7' into 2.8
* 2.7: (24 commits) [#6934] add remember me response listener Update events.rst [#6920] some tweaks after review Note about bundle priority for PrependExtensionInterface [#6905] rewrite code example to cover the setter Change example of ignoring dependencies for yaml [FormComponent]Fix wrong mention in side note Article about logout. Clarify by_reference use Use Terminal lexer for console examples Update entity_provider.rst fixing $formatLevelMap array values Fix subject/verb agreement Fixed directory name type fix link role syntax Update voters.rst Improved the title of Validation Groups article to make it easier to find it Minor reword Fix minor typo in security chapter How to Build a Traditional Login Form Update composer.rst ...
2 parents 6f50d90 + ee5d10f commit b032584

File tree

95 files changed

+307
-332
lines changed

Some content is hidden

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

95 files changed

+307
-332
lines changed
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
from pygments.lexer import RegexLexer, bygroups, using
2+
from pygments.token import *
3+
from pygments.lexers.shell import BashLexer, BatchLexer
4+
5+
class TerminalLexer(RegexLexer):
6+
name = 'Terminal'
7+
aliases = ['terminal']
8+
filenames = []
9+
10+
tokens = {
11+
'root': [
12+
('^\$', Generic.Prompt, 'bash-prompt'),
13+
('^[^\n>]+>', Generic.Prompt, 'dos-prompt'),
14+
('^#.+$', Comment.Single),
15+
('^.+$', Generic.Output),
16+
],
17+
'bash-prompt': [
18+
('(.+)$', bygroups(using(BashLexer)), '#pop')
19+
],
20+
'dos-prompt': [
21+
('(.+)$', bygroups(using(BatchLexer)), '#pop')
22+
],
23+
}

_build/conf.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
from pygments.lexers.special import TextLexer
2525
from pygments.lexers.text import RstLexer
2626
from pygments.lexers.web import PhpLexer
27+
from symfonycom.sphinx.lexer import TerminalLexer
2728

2829
# -- General configuration -----------------------------------------------------
2930

@@ -108,6 +109,7 @@
108109
lexers['rst'] = RstLexer()
109110
lexers['varnish3'] = CLexer()
110111
lexers['varnish4'] = CLexer()
112+
lexers['terminal'] = TerminalLexer()
111113

112114
config_block = {
113115
'markdown': 'Markdown',

assetic/asset_management.rst

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -596,7 +596,7 @@ environment is just too slow.
596596
Instead, each time you use your application in the ``prod`` environment (and therefore,
597597
each time you deploy), you should run the following command:
598598

599-
.. code-block:: bash
599+
.. code-block:: terminal
600600
601601
$ php app/console assetic:dump --env=prod --no-debug
602602
@@ -648,7 +648,7 @@ the following change in your ``config_dev.yml`` file:
648648
Next, since Symfony is no longer generating these assets for you, you'll
649649
need to dump them manually. To do so, run the following command:
650650

651-
.. code-block:: bash
651+
.. code-block:: terminal
652652
653653
$ php app/console assetic:dump
654654
@@ -657,7 +657,7 @@ environment. The big disadvantage is that you need to run this each time
657657
you update an asset. Fortunately, by using the ``assetic:watch`` command,
658658
assets will be regenerated automatically *as they change*:
659659

660-
.. code-block:: bash
660+
.. code-block:: terminal
661661
662662
$ php app/console assetic:watch
663663

assetic/php.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ associated libraries. Therefore, before enabling the filters used in this articl
3030
you must install two libraries. Open a command console, browse to your project
3131
directory and execute the following commands:
3232

33-
.. code-block:: bash
33+
.. code-block:: terminal
3434
3535
$ composer require leafo/scssphp
3636
$ composer require patchwork/jsqueeze

assetic/uglifyjs.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,13 @@ The global installation method makes all your projects use the very same UglifyJ
2828
version, which simplifies its maintenance. Open your command console and execute
2929
the following command (you may need to run it as a root user):
3030

31-
.. code-block:: bash
31+
.. code-block:: terminal
3232
3333
$ npm install -g uglify-js
3434
3535
Now you can execute the global ``uglifyjs`` command anywhere on your system:
3636

37-
.. code-block:: bash
37+
.. code-block:: terminal
3838
3939
$ uglifyjs --help
4040
@@ -45,7 +45,7 @@ It's also possible to install UglifyJS inside your project only, which is useful
4545
when your project requires a specific UglifyJS version. To do this, install it
4646
without the ``-g`` option and specify the path where to put the module:
4747

48-
.. code-block:: bash
48+
.. code-block:: terminal
4949
5050
$ cd /path/to/your/symfony/project
5151
$ npm install uglify-js --prefix app/Resources
@@ -57,7 +57,7 @@ an npm `package.json`_ file and specify your dependencies there.
5757
Now you can execute the ``uglifyjs`` command that lives in the ``node_modules``
5858
directory:
5959

60-
.. code-block:: bash
60+
.. code-block:: terminal
6161
6262
$ "./app/Resources/node_modules/.bin/uglifyjs" --help
6363
@@ -115,7 +115,7 @@ your JavaScripts:
115115
The path where UglifyJS is installed may vary depending on your system.
116116
To find out where npm stores the ``bin`` folder, execute the following command:
117117

118-
.. code-block:: bash
118+
.. code-block:: terminal
119119
120120
$ npm bin -g
121121
@@ -251,7 +251,7 @@ Install, Configure and Use UglifyCSS
251251
The usage of UglifyCSS works the same way as UglifyJS. First, make sure
252252
the node package is installed:
253253

254-
.. code-block:: bash
254+
.. code-block:: terminal
255255
256256
# global installation
257257
$ npm install -g uglifycss

best_practices/business-logic.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ Data Fixtures
279279
As fixtures support is not enabled by default in Symfony, you should execute
280280
the following command to install the Doctrine fixtures bundle:
281281

282-
.. code-block:: bash
282+
.. code-block:: terminal
283283
284284
$ composer require "doctrine/doctrine-fixtures-bundle"
285285
@@ -316,7 +316,7 @@ Assuming you have at least one fixtures class and that the database access
316316
is configured properly, you can load your fixtures by executing the following
317317
command:
318318

319-
.. code-block:: bash
319+
.. code-block:: terminal
320320
321321
$ php app/console doctrine:fixtures:load
322322

best_practices/creating-the-project.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Now that everything is correctly set up, you can create a new project based on
2525
Symfony. In your command console, browse to a directory where you have permission
2626
to create files and execute the following commands:
2727

28-
.. code-block:: bash
28+
.. code-block:: terminal
2929
3030
# Linux, Mac OS X
3131
$ cd projects/
@@ -145,7 +145,7 @@ that follows these best practices:
145145
If your Symfony installation doesn't come with a pre-generated AppBundle,
146146
you can generate it by hand executing this command:
147147

148-
.. code-block:: bash
148+
.. code-block:: terminal
149149
150150
$ php app/console generate:bundle --namespace=AppBundle --dir=src --format=annotation --no-interaction
151151

best_practices/introduction.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ best practices in mind. This project, called the Symfony Demo application, can
7474
be obtained through the Symfony Installer. First, `download and install`_ the
7575
installer and then execute this command to download the demo application:
7676

77-
.. code-block:: bash
77+
.. code-block:: terminal
7878
7979
# Linux and Mac OS X
8080
$ symfony demo

best_practices/templates.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ the Markdown contents of each post into HTML.
6969
To do this, first, install the excellent `Parsedown`_ Markdown parser as
7070
a new dependency of the project:
7171

72-
.. code-block:: bash
72+
.. code-block:: terminal
7373
7474
$ composer require erusev/parsedown
7575

bundles.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ And while it doesn't do anything yet, AcmeTestBundle is now ready to be used.
119119
And as easy as this is, Symfony also provides a command-line interface for
120120
generating a basic bundle skeleton:
121121

122-
.. code-block:: bash
122+
.. code-block:: terminal
123123
124124
$ php app/console generate:bundle --namespace=Acme/TestBundle
125125

0 commit comments

Comments
 (0)