Micro-optimization

dlsniper · fabpot · commit 5377290fbf33 · 2013-02-04T13:46:31.000+01:00
diff --git a/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php b/src/Symfony/Component/DependencyInjection/Dumper/PhpDumper.php
@@ -746,7 +746,7 @@ public function getParameter(\$name)
     {
         \$name = strtolower(\$name);
 
-        if (!array_key_exists(\$name, \$this->parameters)) {
+        if (!(isset(\$this->parameters[\$name]) || array_key_exists(\$name, \$this->parameters))) {
             throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', \$name));
         }
 
@@ -758,7 +758,9 @@ public function getParameter(\$name)
      */
     public function hasParameter(\$name)
     {
-        return array_key_exists(strtolower(\$name), \$this->parameters);
+        \$name = strtolower(\$name);
+
+        return isset(\$this->parameters[\$name]) || array_key_exists(\$name, \$this->parameters);
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services10.php
@@ -55,7 +55,7 @@ public function getParameter($name)
     {
         $name = strtolower($name);
 
-        if (!array_key_exists($name, $this->parameters)) {
+        if (!(isset($this->parameters[$name]) || array_key_exists($name, $this->parameters))) {
             throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
         }
 
@@ -67,7 +67,9 @@ public function getParameter($name)
      */
     public function hasParameter($name)
     {
-        return array_key_exists(strtolower($name), $this->parameters);
+        $name = strtolower($name);
+
+        return isset($this->parameters[$name]) || array_key_exists($name, $this->parameters);
     }
 
     /**
diff --git a/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php b/src/Symfony/Component/DependencyInjection/Tests/Fixtures/php/services9_compiled.php
@@ -191,7 +191,7 @@ public function getParameter($name)
     {
         $name = strtolower($name);
 
-        if (!array_key_exists($name, $this->parameters)) {
+        if (!(isset($this->parameters[$name]) || array_key_exists($name, $this->parameters))) {
             throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));
         }
 
@@ -203,7 +203,9 @@ public function getParameter($name)
      */
     public function hasParameter($name)
     {
-        return array_key_exists(strtolower($name), $this->parameters);
+        $name = strtolower($name);
+
+        return isset($this->parameters[$name]) || array_key_exists($name, $this->parameters);
     }
 
     /**

Original file line number	Diff line number	Diff line change
`@@ -746,7 +746,7 @@ public function getParameter(\$name)`
`746`	`746`	`{`
`747`	`747`	`\$name = strtolower(\$name);`
`748`	`748`
`749`		`- if (!array_key_exists(\$name, \$this->parameters)) {`
	`749`	`+ if (!(isset(\$this->parameters[\$name]) \|\| array_key_exists(\$name, \$this->parameters))) {`
`750`	`750`	`throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', \$name));`
`751`	`751`	`}`
`752`	`752`
`@@ -758,7 +758,9 @@ public function getParameter(\$name)`
`758`	`758`	`*/`
`759`	`759`	`public function hasParameter(\$name)`
`760`	`760`	`{`
`761`		`- return array_key_exists(strtolower(\$name), \$this->parameters);`
	`761`	`+ \$name = strtolower(\$name);`
	`762`	`+`
	`763`	`+ return isset(\$this->parameters[\$name]) \|\| array_key_exists(\$name, \$this->parameters);`
`762`	`764`	`}`
`763`	`765`
`764`	`766`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function getParameter($name)`
`55`	`55`	`{`
`56`	`56`	`$name = strtolower($name);`
`57`	`57`
`58`		`- if (!array_key_exists($name, $this->parameters)) {`
	`58`	`+ if (!(isset($this->parameters[$name]) \|\| array_key_exists($name, $this->parameters))) {`
`59`	`59`	`throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));`
`60`	`60`	`}`
`61`	`61`
`@@ -67,7 +67,9 @@ public function getParameter($name)`
`67`	`67`	`*/`
`68`	`68`	`public function hasParameter($name)`
`69`	`69`	`{`
`70`		`- return array_key_exists(strtolower($name), $this->parameters);`
	`70`	`+ $name = strtolower($name);`
	`71`	`+`
	`72`	`+ return isset($this->parameters[$name]) \|\| array_key_exists($name, $this->parameters);`
`71`	`73`	`}`
`72`	`74`
`73`	`75`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -191,7 +191,7 @@ public function getParameter($name)`
`191`	`191`	`{`
`192`	`192`	`$name = strtolower($name);`
`193`	`193`
`194`		`- if (!array_key_exists($name, $this->parameters)) {`
	`194`	`+ if (!(isset($this->parameters[$name]) \|\| array_key_exists($name, $this->parameters))) {`
`195`	`195`	`throw new InvalidArgumentException(sprintf('The parameter "%s" must be defined.', $name));`
`196`	`196`	`}`
`197`	`197`
`@@ -203,7 +203,9 @@ public function getParameter($name)`
`203`	`203`	`*/`
`204`	`204`	`public function hasParameter($name)`
`205`	`205`	`{`
`206`		`- return array_key_exists(strtolower($name), $this->parameters);`
	`206`	`+ $name = strtolower($name);`
	`207`	`+`
	`208`	`+ return isset($this->parameters[$name]) \|\| array_key_exists($name, $this->parameters);`
`207`	`209`	`}`
`208`	`210`
`209`	`211`	`/**`