Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commita1d6bbb

Browse files
committed
Merge branch '3.4' into 4.1
* 3.4: Update custom_constraint.rst Documentation: copy-files.rst: fix missing code-block replace connect.sensiolabs.com by connect.symfony.com replace SensioLabsConnect by SymfonyConnect
2 parents8a0bea3 +8265c4d commita1d6bbb

File tree

6 files changed

+16
-10
lines changed

6 files changed

+16
-10
lines changed

‎best_practices/introduction.rst‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,5 +102,5 @@ for not doing it are various:
102102

103103
Next::doc:`/best_practices/creating-the-project`
104104

105-
.. _`Fabien Potencier`:https://connect.sensiolabs.com/profile/fabpot
105+
.. _`Fabien Potencier`:https://connect.symfony.com/profile/fabpot
106106
.. _`Symfony Demo`:https://github.com/symfony/demo

‎contributing/code_of_conduct/care_team.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,19 +25,19 @@ also contact all of them at once by emailing **coc@symfony.com**:
2525

2626
* *E-mail*: emilie.lorenzo [at] symfony.com
2727
* *Twitter*: `@EmilieLorenzo<https://twitter.com/EmilieLorenzo>`_
28-
* *SensioConnect*: `emilielorenzo<https://connect.sensiolabs.com/profile/emilielorenzo>`_
28+
* *SymfonyConnect*: `emilielorenzo<https://connect.symfony.com/profile/emilielorenzo>`_
2929

3030
* **Michelle Sanver**
3131

3232
* *E-mail*: hello [at] michellesanver.com
3333
* *Twitter*: `@michellesanver<https://twitter.com/michellesanver>`_
34-
* *SensioConnect*: `michellesanver<https://connect.sensiolabs.com/profile/michellesanver>`_
34+
* *SymfonyConnect*: `michellesanver<https://connect.symfony.com/profile/michellesanver>`_
3535

3636
* **Tobias Nyholm**
3737

3838
* *E-mail*: tobias.nyholm [at] gmail.com
3939
* *Twitter*: `@tobiasnyholm<https://twitter.com/tobiasnyholm>`_
40-
* *SensioConnect*: `tobias<https://connect.sensiolabs.com/profile/tobias>`_
40+
* *SymfonyConnect*: `tobias<https://connect.symfony.com/profile/tobias>`_
4141

4242
About the CARE Team
4343
-------------------

‎contributing/documentation/overview.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ changes and push the new changes:
186186
187187
**Step 10.** After your pull request is eventually accepted and merged in the
188188
Symfony documentation, you will be included in the `Symfony Documentation
189-
Contributors`_ list. Moreover, if you happen to have a `SensioLabsConnect`_
189+
Contributors`_ list. Moreover, if you happen to have a `SymfonyConnect`_
190190
profile, you will get a cool `Symfony Documentation Badge`_.
191191

192192
Your Next Documentation Contributions
@@ -323,8 +323,8 @@ definitely don't want you to waste your time!
323323
.. _`GitHub`:https://github.com/
324324
.. _`fork the repository`:https://help.github.com/articles/fork-a-repo
325325
.. _`Symfony Documentation Contributors`:https://symfony.com/contributors/doc
326-
.. _`SensioLabsConnect`:https://connect.sensiolabs.com/
327-
.. _`Symfony Documentation Badge`:https://connect.sensiolabs.com/badge/36/symfony-documentation-contributor
326+
.. _`SymfonyConnect`:https://connect.symfony.com/
327+
.. _`Symfony Documentation Badge`:https://connect.symfony.com/badge/36/symfony-documentation-contributor
328328
.. _`sync your fork`:https://help.github.com/articles/syncing-a-fork
329329
.. _`Platform.sh`:https://platform.sh
330330
.. _`roadmap`:https://symfony.com/roadmap

‎frontend/encore/copy-files.rst‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ files into your final output directory.
4040
4141
+ .copyFiles({
4242
+ from: './assets/images',
43-
+
43+
+
4444
+ // optional target path, relative to the output dir
4545
+ //to: 'images/[path][name].[ext]',
4646
+
@@ -54,6 +54,8 @@ include a hash based on their content.
5454

5555
To render inside Twig, use the ``asset()`` function:
5656

57+
..code-block::html+twig
58+
5759
{# assets/images/logo.png was copied to public/build/logo.png #}
5860
<img src="{{ asset('build/logo.png') }}"
5961

‎service_container/3.3-di-changes.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ Ready to upgrade your existing project? Great! Suppose you have the following co
503503
app.api_client_sl_connect:
504504
class:App\Service\ApiClient
505505
arguments:
506-
-'https://connect.sensiolabs.com/api'
506+
-'https://connect.symfony.com/api'
507507
508508
It's optional, but let's upgrade this to the new Symfony 3.3 configuration step-by-step,
509509
*without* breaking our application.
@@ -795,7 +795,7 @@ can be autowired. The final configuration looks like this:
795795
app.api_client_sl_connect:
796796
class:App\Service\ApiClient
797797
arguments:
798-
-'https://connect.sensiolabs.com/api'
798+
-'https://connect.symfony.com/api'
799799
800800
You can now take advantage of the new features going forward.
801801

‎validation/custom_constraint.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,10 @@ The validator class is also simple, and only has one required method ``validate(
6565
{
6666
public function validate($value, Constraint $constraint)
6767
{
68+
if (!$constraint instanceof ContainsAlphanumeric) {
69+
throw new UnexpectedTypeException($constraint, ContainsAlphanumeric::class);
70+
}
71+
6872
// custom constraints should ignore null and empty values to allow
6973
// other constraints (NotBlank, NotNull, etc.) take care of that
7074
if (null === $value || '' === $value) {

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp