Make PEAR_Dependency2::normalizeDep() static

nikic · nikic · commit 1488617710ae · 2019-02-07T11:59:15.000+01:00
Also adjust one call to it, though this is not strictly necessary.
diff --git a/PEAR/Dependency2.php b/PEAR/Dependency2.php
@@ -1232,7 +1232,7 @@ function validateDependency1($dep, $params = array())
             $dep['optional'] = 'no';
         }
 
-        list($newdep, $type) = $this->normalizeDep($dep);
+        list($newdep, $type) = self::normalizeDep($dep);
         if (!$newdep) {
             return $this->raiseError("Invalid Dependency");
         }
@@ -1246,7 +1246,7 @@ function validateDependency1($dep, $params = array())
     /**
      * Convert a 1.0 dep into a 2.0 dep
      */
-    function normalizeDep($dep)
+    static function normalizeDep($dep)
     {
         $types = array(
             'pkg' => 'Package',

Original file line number	Diff line number	Diff line change
`@@ -1232,7 +1232,7 @@ function validateDependency1($dep, $params = array())`
`1232`	`1232`	`$dep['optional'] = 'no';`
`1233`	`1233`	`}`
`1234`	`1234`
`1235`		`- list($newdep, $type) = $this->normalizeDep($dep);`
	`1235`	`+ list($newdep, $type) = self::normalizeDep($dep);`
`1236`	`1236`	`if (!$newdep) {`
`1237`	`1237`	`return $this->raiseError("Invalid Dependency");`
`1238`	`1238`	`}`
`@@ -1246,7 +1246,7 @@ function validateDependency1($dep, $params = array())`
`1246`	`1246`	`/**`
`1247`	`1247`	`* Convert a 1.0 dep into a 2.0 dep`
`1248`	`1248`	`*/`
`1249`		`- function normalizeDep($dep)`
	`1249`	`+ static function normalizeDep($dep)`
`1250`	`1250`	`{`
`1251`	`1251`	`$types = array(`
`1252`	`1252`	`'pkg' => 'Package',`