Merge branch '3.4' into 4.1

javiereguiluz · javiereguiluz · commit a1d6bbb360cf · 2018-11-14T17:43:37.000+01:00
* 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
diff --git a/best_practices/introduction.rst b/best_practices/introduction.rst
@@ -102,5 +102,5 @@ for not doing it are various:
 
 Next: :doc:`/best_practices/creating-the-project`
 
-.. _`Fabien Potencier`: https://connect.sensiolabs.com/profile/fabpot
+.. _`Fabien Potencier`: https://connect.symfony.com/profile/fabpot
 .. _`Symfony Demo`: https://github.com/symfony/demo
diff --git a/contributing/code_of_conduct/care_team.rst b/contributing/code_of_conduct/care_team.rst
@@ -25,19 +25,19 @@ also contact all of them at once by emailing **coc@symfony.com**:
 
   * *E-mail*: emilie.lorenzo [at] symfony.com
   * *Twitter*: `@EmilieLorenzo <https://twitter.com/EmilieLorenzo>`_
-  * *SensioConnect*: `emilielorenzo <https://connect.sensiolabs.com/profile/emilielorenzo>`_
+  * *SymfonyConnect*: `emilielorenzo <https://connect.symfony.com/profile/emilielorenzo>`_
 
 * **Michelle Sanver**
 
   * *E-mail*: hello [at] michellesanver.com
   * *Twitter*: `@michellesanver <https://twitter.com/michellesanver>`_
-  * *SensioConnect*: `michellesanver <https://connect.sensiolabs.com/profile/michellesanver>`_
+  * *SymfonyConnect*: `michellesanver <https://connect.symfony.com/profile/michellesanver>`_
 
 * **Tobias Nyholm**
 
   * *E-mail*: tobias.nyholm [at] gmail.com
   * *Twitter*: `@tobiasnyholm <https://twitter.com/tobiasnyholm>`_
-  * *SensioConnect*: `tobias <https://connect.sensiolabs.com/profile/tobias>`_
+  * *SymfonyConnect*: `tobias <https://connect.symfony.com/profile/tobias>`_
 
 About the CARE Team
 -------------------
diff --git a/contributing/documentation/overview.rst b/contributing/documentation/overview.rst
@@ -186,7 +186,7 @@ changes and push the new changes:
 
 **Step 10.** After your pull request is eventually accepted and merged in the
 Symfony documentation, you will be included in the `Symfony Documentation
-Contributors`_ list. Moreover, if you happen to have a `SensioLabsConnect`_
+Contributors`_ list. Moreover, if you happen to have a `SymfonyConnect`_
 profile, you will get a cool `Symfony Documentation Badge`_.
 
 Your Next Documentation Contributions
@@ -323,8 +323,8 @@ definitely don't want you to waste your time!
 .. _`GitHub`: https://github.com/
 .. _`fork the repository`: https://help.github.com/articles/fork-a-repo
 .. _`Symfony Documentation Contributors`: https://symfony.com/contributors/doc
-.. _`SensioLabsConnect`: https://connect.sensiolabs.com/
-.. _`Symfony Documentation Badge`: https://connect.sensiolabs.com/badge/36/symfony-documentation-contributor
+.. _`SymfonyConnect`: https://connect.symfony.com/
+.. _`Symfony Documentation Badge`: https://connect.symfony.com/badge/36/symfony-documentation-contributor
 .. _`sync your fork`: https://help.github.com/articles/syncing-a-fork
 .. _`Platform.sh`: https://platform.sh
 .. _`roadmap`: https://symfony.com/roadmap
diff --git a/frontend/encore/copy-files.rst b/frontend/encore/copy-files.rst
@@ -40,7 +40,7 @@ files into your final output directory.
 
     +     .copyFiles({
     +         from: './assets/images',
-    + 
+    +
     +         // optional target path, relative to the output dir
     +         //to: 'images/[path][name].[ext]',
     +
@@ -54,6 +54,8 @@ include a hash based on their content.
 
 To render inside Twig, use the ``asset()`` function:
 
+.. code-block:: html+twig
+
     {# assets/images/logo.png was copied to public/build/logo.png #}
     <img src="{{ asset('build/logo.png') }}"
 
diff --git a/service_container/3.3-di-changes.rst b/service_container/3.3-di-changes.rst
@@ -503,7 +503,7 @@ Ready to upgrade your existing project? Great! Suppose you have the following co
         app.api_client_sl_connect:
             class: App\Service\ApiClient
             arguments:
-                - 'https://connect.sensiolabs.com/api'
+                - 'https://connect.symfony.com/api'
 
 It's optional, but let's upgrade this to the new Symfony 3.3 configuration step-by-step,
 *without* breaking our application.
@@ -795,7 +795,7 @@ can be autowired. The final configuration looks like this:
         app.api_client_sl_connect:
             class: App\Service\ApiClient
             arguments:
-                - 'https://connect.sensiolabs.com/api'
+                - 'https://connect.symfony.com/api'
 
 You can now take advantage of the new features going forward.
 
diff --git a/validation/custom_constraint.rst b/validation/custom_constraint.rst
@@ -65,6 +65,10 @@ The validator class is also simple, and only has one required method ``validate(
     {
         public function validate($value, Constraint $constraint)
         {
+            if (!$constraint instanceof ContainsAlphanumeric) {
+               throw new UnexpectedTypeException($constraint, ContainsAlphanumeric::class);
+            }
+            
             // custom constraints should ignore null and empty values to allow
             // other constraints (NotBlank, NotNull, etc.) take care of that
             if (null === $value || '' === $value) {

Original file line number	Diff line number	Diff line change
@@ -65,6 +65,10 @@ The validator class is also simple, and only has one required method ``validate(
`65`	`65`	`{`
`66`	`66`	`public function validate($value, Constraint $constraint)`
`67`	`67`	`{`
	`68`	`+ if (!$constraint instanceof ContainsAlphanumeric) {`
	`69`	`+ throw new UnexpectedTypeException($constraint, ContainsAlphanumeric::class);`
	`70`	`+ }`
	`71`	`+`
`68`	`72`	`// custom constraints should ignore null and empty values to allow`
`69`	`73`	`// other constraints (NotBlank, NotNull, etc.) take care of that`
`70`	`74`	`if (null === $value \|\| '' === $value) {`