Changeset 7681 for trunk/library

Timestamp:

12/19/12 16:44:18 (11 years ago)

Author:

douglasz

Message:

Ticket #3236 - Correcoes para Best Practice: Short Open Tag e Best Practice: Always Quote Array Keys.

Location:

trunk/library/PEAR/PEAR

Files:

• Builder.php (modified) (1 diff)
• ChannelFile.php (modified) (1 diff)
• Command/Common.php (modified) (1 diff)
• Command/Registry.php (modified) (9 diffs)
• Command/Remote.php (modified) (1 diff)
• Downloader.php (modified) (1 diff)
• Frontend/CLI.php (modified) (1 diff)
• Installer.php (modified) (6 diffs)
• PackageFile/Generator/v1.php (modified) (8 diffs)
• PackageFile/Parser/v1.php (modified) (1 diff)
• REST.php (modified) (1 diff)
• Task/Replace.php (modified) (4 diffs)

trunk/library/PEAR/PEAR/Builder.php

@@ -333 +333 @@
                 if (substr($o['name'], 0, 5) == 'with-' &&
                     ($r == 'yes' || $r == 'autodetect')) {
-                    $configure_command .= " --$o[name]";
+                    $configure_command .= " --{$o['name']}";
                 } else {
-                    $configure_command .= " --$o[name]=".trim($r);
+                    $configure_command .= " --{$o['name']}=".trim($r);
                 }
             }

trunk/library/PEAR/PEAR/ChannelFile.php

@@ -459 +459 @@
             . $channelInfo['attribs']['version'] . " http://pear.php.net/dtd/channel-" .
             $channelInfo['attribs']['version'] . ".xsd\">
- <name>$channelInfo[name]</name>
+ <name>{$channelInfo['name']}</name>
  <summary>" . htmlspecialchars($channelInfo['summary'])."</summary>
 ";

trunk/library/PEAR/PEAR/Command/Common.php

@@ -223 +223 @@
                         $lapp = "[=$arg]";
                     } else {
-                        $sapp = " $v[arg]";
-                        $lapp = "=$v[arg]";
+                        $sapp = " {$v['arg']}";
+                        $lapp = "={$v['arg']}";
                     }
                 } else {

trunk/library/PEAR/PEAR/Command/Registry.php

@@ -514 +514 @@
                                 $mstr .= $m['handle'] . '@php.net';
                             }
-                            $mstr .= "> ($m[role])";
+                            $mstr .= "> ({$m['role']})";
                         }
                         $info[$key] = $mstr;
@@ -866 +866 @@
                     $info[$infoindex] .= "$type $name";
                     if (isset($package['uri'])) {
-                        $info[$infoindex] .= "\n  Download URI: $package[uri]";
+                        $info[$infoindex] .= "\n  Download URI: {$package['uri']}";
                         continue;
                     }
@@ -882 +882 @@
 
                     if (isset($package['recommended'])) {
-                        $info[$infoindex] .= "\n  Recommended version: $package[recommended]";
+                        $info[$infoindex] .= "\n  Recommended version: {$package['recommended']}";
                     }
 
@@ -920 +920 @@
                         $info['Not Compatible with'] .= "\n";
                     }
-                    $info['Not Compatible with'] .= "$os[name] Operating System";
+                    $info['Not Compatible with'] .= "{$os['name']} Operating System";
                 } else {
                     $info['Required Dependencies'] .= "\n";
-                    $info['Required Dependencies'] .= "$os[name] Operating System";
+                    $info['Required Dependencies'] .= "{$os['name']} Operating System";
                 }
             }
@@ -940 +940 @@
                         $info['Not Compatible with'] .= "\n";
                     }
-                    $info['Not Compatible with'] .= "OS/Arch matching pattern '/$os[pattern]/'";
+                    $info['Not Compatible with'] .= "OS/Arch matching pattern '/{$os['pattern']}/'";
                 } else {
                     $info['Required Dependencies'] .= "\n";
-                    $info['Required Dependencies'] .= "OS/Arch matching pattern '/$os[pattern]/'";
+                    $info['Required Dependencies'] .= "OS/Arch matching pattern '/{$os['pattern']}/'";
                 }
             }
@@ -1006 +1006 @@
 
                         if (isset($package['recommended'])) {
-                            $info[$infoindex] .= "\n  Recommended version: $package[recommended]";
+                            $info[$infoindex] .= "\n  Recommended version: {$package['recommended']}";
                         }
 
@@ -1066 +1066 @@
                                 }
 
-                                $info[$groupindex] .= "\n  Download URI: $package[uri]";
+                                $info[$groupindex] .= "\n  Download URI: {$package['uri']}";
                                 continue;
                             }
@@ -1088 +1088 @@
 
                             if (isset($package['recommended'])) {
-                                $info[$groupindex] .= "\n  Recommended version: $package[recommended]";
+                                $info[$groupindex] .= "\n  Recommended version: {$package['recommended']}";
                             }
 
@@ -1119 +1119 @@
                 if (isset($package['uri'])) {
                     $info['Bundled Packages'] .= '__uri/' . $package['name'];
-                    $info['Bundled Packages'] .= "\n  (URI: $package[uri]";
+                    $info['Bundled Packages'] .= "\n  (URI: {$package['uri']}";
                 } else {
                     $info['Bundled Packages'] .= $package['channel'] . '/' . $package['name'];

trunk/library/PEAR/PEAR/Command/Remote.php

@@ -623 +623 @@
         $downloaded = $downloader->getDownloadedPackages();
         foreach ($downloaded as $pkg) {
-            $this->ui->outputData("File $pkg[file] downloaded", $command);
+            $this->ui->outputData("File {$pkg['file']} downloaded", $command);
         }
 

trunk/library/PEAR/PEAR/Downloader.php

@@ -1633 +1633 @@
 
             if (isset($lastmodified['ETag'])) {
-                $ifmodifiedsince .= "If-None-Match: $lastmodified[ETag]\r\n";
+                $ifmodifiedsince .= "If-None-Match: {$lastmodified['ETag']}\r\n";
             }
         } else {

trunk/library/PEAR/PEAR/Frontend/CLI.php

@@ -106 +106 @@
                     $frame['function'] = !isset($frame['function']) ? '' : $frame['function'];
                     $frame['line']     = !isset($frame['line'])     ? '' : $frame['line'];
-                    $this->_displayLine("#$i: $frame[class]$frame[type]$frame[function] $frame[line]");
+                    $this->_displayLine("#$i: {$frame['class']}{$frame['type']}{$frame['function']}{$frame['line']}");
                 }
             }

trunk/library/PEAR/PEAR/Installer.php

@@ -236 +236 @@
 
             if ((bool) $os->matchSignature($platform) === $negate) {
-                $this->log(3, "skipped $file (meant for $atts[platform], we are ".$os->getSignature().")");
+                $this->log(3, "skipped $file (meant for {$atts['platform']}, we are ".$os->getSignature().")");
                 return PEAR_INSTALLER_SKIPPED;
             }
@@ -264 +264 @@
                 break;
             default:
-                return $this->raiseError("Invalid role `$atts[role]' for file $file");
+                return $this->raiseError("Invalid role '{$atts['role']}' for file $file");
         }
 
@@ -354 +354 @@
                     if ($a['type'] == 'php-const') {
                         if (preg_match('/^[a-z0-9_]+\\z/i', $a['to'])) {
-                            eval("\$to = $a[to];");
+                            eval("\$to = {$a['to']};");
                         } else {
                             if (!isset($options['soft'])) {
-                                $this->log(0, "invalid php-const replacement: $a[to]");
+                                $this->log(0, "invalid php-const replacement: {$a['to']}");
                             }
                             continue;
@@ -374 +374 @@
                         if (is_null($to)) {
                             if (!isset($options['soft'])) {
-                                $this->log(0, "invalid pear-config replacement: $a[to]");
+                                $this->log(0, "invalid pear-config replacement: {$a['to']}");
                             }
                             continue;
@@ -383 +383 @@
                         } else {
                             if (!isset($options['soft'])) {
-                                $this->log(0, "invalid package-info replacement: $a[to]");
+                                $this->log(0, "invalid package-info replacement: {$a['to']}");
                             }
                             continue;
@@ -1586 +1586 @@
                 }
 
-                $this->log(3, "+ cp $ext[file] $copyto");
+                $this->log(3, "+ cp {$ext['file']} $copyto");
                 $this->addFileOperation('rename', array($ext['file'], $copyto));
                 if (!OS_WINDOWS) {

trunk/library/PEAR/PEAR/PackageFile/Generator/v1.php

@@ -204 +204 @@
 " <name>$pkginfo[package]</name>";
         if (isset($pkginfo['extends'])) {
-            $ret .= "\n<extends>$pkginfo[extends]</extends>";
+            $ret .= "\n<extends>{$pkginfo['extends']}</extends>";
         }
         $ret .=
@@ -251 +251 @@
         $ret = "$indent <release>\n";
         if (!empty($pkginfo['version'])) {
-            $ret .= "$indent  <version>$pkginfo[version]</version>\n";
+            $ret .= "$indent  <version>{$pkginfo['version']}</version>\n";
         }
         if (!empty($pkginfo['release_date'])) {
-            $ret .= "$indent  <date>$pkginfo[release_date]</date>\n";
+            $ret .= "$indent  <date>{$pkginfo['release_date']}</date>\n";
         }
         if (!empty($pkginfo['release_license'])) {
-            $ret .= "$indent  <license>$pkginfo[release_license]</license>\n";
+            $ret .= "$indent  <license>{$pkginfo['release_license']}</license>\n";
         }
         if (!empty($pkginfo['release_state'])) {
-            $ret .= "$indent  <state>$pkginfo[release_state]</state>\n";
+            $ret .= "$indent  <state>{$pkginfo['release_state']}</state>\n";
         }
         if (!empty($pkginfo['release_notes'])) {
@@ -272 +272 @@
             $ret .= "$indent  <deps>\n";
             foreach ($pkginfo['release_deps'] as $dep) {
-                $ret .= "$indent   <dep type=\"$dep[type]\" rel=\"$dep[rel]\"";
+                $ret .= "$indent   <dep type=\"{$dep['type']}\" rel=\"{$dep['rel']}\"";
                 if (isset($dep['version'])) {
-                    $ret .= " version=\"$dep[version]\"";
+                    $ret .= " version=\"{$dep['version']}\"";
                 }
                 if (isset($dep['optional'])) {
-                    $ret .= " optional=\"$dep[optional]\"";
+                    $ret .= " optional=\"{$dep['optional']}\"";
                 }
                 if (isset($dep['name'])) {
-                    $ret .= ">$dep[name]</dep>\n";
+                    $ret .= ">{$dep['name']}</dep>\n";
                 } else {
                     $ret .= "/>\n";
@@ -302 +302 @@
         if (isset($pkginfo['provides'])) {
             foreach ($pkginfo['provides'] as $key => $what) {
-                $ret .= "$indent  <provides type=\"$what[type]\" ";
-                $ret .= "name=\"$what[name]\" ";
+                $ret .= "$indent  <provides type=\"{$what['type']}\" ";
+                $ret .= "name=\"{$what['name']}\" ";
                 if (isset($what['extends'])) {
-                    $ret .= "extends=\"$what[extends]\" ";
+                    $ret .= "extends=\"{$what['extends']}\" ";
                 }
                 $ret .= "/>\n";
@@ -319 +319 @@
                         $fa['role'] = '';
                     }
-                    $ret .= "$indent   <file role=\"$fa[role]\"";
+                    $ret .= "$indent   <file role=\"{$fa['role']}\"";
                     if (isset($fa['baseinstalldir'])) {
                         $ret .= ' baseinstalldir="' .
@@ -325 +325 @@
                     }
                     if (isset($fa['md5sum'])) {
-                        $ret .= " md5sum=\"$fa[md5sum]\"";
+                        $ret .= " md5sum=\"{$fa['md5sum']}\"";
                     }
                     if (isset($fa['platform'])) {
-                        $ret .= " platform=\"$fa[platform]\"";
+                        $ret .= " platform=\"{$fa['platform']}\"";
                     }
                     if (!empty($fa['install-as'])) {
@@ -427 +427 @@
     function _formatFile($file, $attributes, $indent)
     {
-        $ret = "$indent   <file role=\"$attributes[role]\"";
+        $ret = "$indent   <file role=\"{$attributes['role']}\"";
         if (isset($attributes['baseinstalldir'])) {
             $ret .= ' baseinstalldir="' .
@@ -433 +433 @@
         }
         if (isset($attributes['md5sum'])) {
-            $ret .= " md5sum=\"$attributes[md5sum]\"";
+            $ret .= " md5sum=\"{$attributes['md5sum']}\"";
         }
         if (isset($attributes['platform'])) {
-            $ret .= " platform=\"$attributes[platform]\"";
+            $ret .= " platform=\"{$attributes['platform']}\"";
         }
         if (!empty($attributes['install-as'])) {

trunk/library/PEAR/PEAR/PackageFile/Parser/v1.php

@@ -269 +269 @@
                 }
                 $attribs['explicit'] = true;
-                $this->_packageInfo['provides']["$attribs[type];$attribs[name]"] = $attribs;
+                $this->_packageInfo['provides']["{$attribs['type']};{$attribs['name']}"] = $attribs;
                 break;
             case 'package' :

trunk/library/PEAR/PEAR/REST.php

@@ -377 +377 @@
 
             if (isset($lastmodified['ETag'])) {
-                $ifmodifiedsince .= "If-None-Match: $lastmodified[ETag]\r\n";
+                $ifmodifiedsince .= "If-None-Match: {$lastmodified['ETag']}\r\n";
             }
         } else {

trunk/library/PEAR/PEAR/Task/Replace.php

@@ -124 +124 @@
                         $to = $chan->getServer();
                     } else {
-                        $this->logger->log(0, "$dest: invalid pear-config replacement: $a[to]");
+                        $this->logger->log(0, "$dest: invalid pear-config replacement: {$a['to']}");
                         return false;
                     }
@@ -140 +140 @@
                 }
                 if (is_null($to)) {
-                    $this->logger->log(0, "$dest: invalid pear-config replacement: $a[to]");
+                    $this->logger->log(0, "$dest: invalid pear-config replacement: {$a['to']}");
                     return false;
                 }
@@ -150 +150 @@
                     $to = constant($a['to']);
                 } else {
-                    $this->logger->log(0, "$dest: invalid php-const replacement: $a[to]");
+                    $this->logger->log(0, "$dest: invalid php-const replacement: {$a['to']}");
                     return false;
                 }
@@ -157 +157 @@
                     $to = $t;
                 } else {
-                    $this->logger->log(0, "$dest: invalid package-info replacement: $a[to]");
+                    $this->logger->log(0, "$dest: invalid package-info replacement: {$a['to']}");
                     return false;
                 }