Merge branch '3.3' into 3.4

fabpot · fabpot · commit 1d932ae12b70 · 2017-12-11T12:38:23.000-08:00
* 3.3:
  Tweaking class not found autowiring error
  [TwigBridge] Add missing dev requirement for workflow
  fixed #25440
  empty lines don't count for indent detection
diff --git a/Adapter/ExtLdap/Query.php b/Adapter/ExtLdap/Query.php
@@ -73,7 +73,7 @@ public function execute()
                     $func = 'ldap_search';
                     break;
                 default:
-                    throw new LdapException(sprintf('Could not search in scope %s', $this->options['scopen']));
+                    throw new LdapException(sprintf('Could not search in scope "%s"', $this->options['scope']));
             }
 
             $this->search = @$func(

Original file line number	Diff line number	Diff line change
`@@ -73,7 +73,7 @@ public function execute()`
`73`	`73`	`$func = 'ldap_search';`
`74`	`74`	`break;`
`75`	`75`	`default:`
`76`		`- throw new LdapException(sprintf('Could not search in scope %s', $this->options['scopen']));`
	`76`	`+ throw new LdapException(sprintf('Could not search in scope "%s"', $this->options['scope']));`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`$this->search = @$func(`