Merge branch '5.1' into 5.2

nicolas-grekas · nicolas-grekas · commit 43e9eb1b4c9d · 2021-01-04T18:59:10.000+01:00
* 5.1:
  Cleanup CI scripts
  fix code style
  fix code style
  take query and request parameters into account when matching routes
  mistake
  fix tests to run assertions on returned Crawler instances
  propagate groups to nested constraints
diff --git a/Tests/LdapTestCase.php b/Tests/LdapTestCase.php
@@ -9,7 +9,7 @@ class LdapTestCase extends TestCase
     protected function getLdapConfig()
     {
         $h = @ldap_connect(getenv('LDAP_HOST'), getenv('LDAP_PORT'));
-        @ldap_set_option($h, LDAP_OPT_PROTOCOL_VERSION, 3);
+        @ldap_set_option($h, \LDAP_OPT_PROTOCOL_VERSION, 3);
 
         if (!$h || !@ldap_bind($h)) {
             $this->markTestSkipped('No server is listening on LDAP_HOST:LDAP_PORT');

Original file line number	Diff line number	Diff line change
`@@ -9,7 +9,7 @@ class LdapTestCase extends TestCase`
`9`	`9`	`protected function getLdapConfig()`
`10`	`10`	`{`
`11`	`11`	`$h = @ldap_connect(getenv('LDAP_HOST'), getenv('LDAP_PORT'));`
`12`		`- @ldap_set_option($h, LDAP_OPT_PROTOCOL_VERSION, 3);`
	`12`	`+ @ldap_set_option($h, \LDAP_OPT_PROTOCOL_VERSION, 3);`
`13`	`13`
`14`	`14`	`if (!$h \|\| !@ldap_bind($h)) {`
`15`	`15`	`$this->markTestSkipped('No server is listening on LDAP_HOST:LDAP_PORT');`