Merge pull request #1 from xp-framework/refactor/short-arrays

Use short array syntax / ::class syntax in annotations

Author: thekid

.travis.yml

@@ -2,19 +2,17 @@
 
 language: php
 
+sudo: false
+
 php:
   - 5.4
   - 5.5
   - 5.6
   - hhvm
   - nightly
 
-matrix:
-  allow_failures:
-    - php: nightly
-
 before_script:
-  - wget 'https://github.com/xp-framework/xp-runners/releases/download/v5.2.0/setup' -O - | php
+  - wget 'https://github.com/xp-framework/xp-runners/releases/download/v5.5.0/setup' -O - | php
   - composer install --prefer-dist
   - echo "vendor/autoload.php" > composer.pth
   - echo "use=vendor/xp-framework/core" > xp.ini

src/main/php/peer/ftp/FtpConnection.class.php

@@ -90,13 +90,13 @@ public function connect() {
     $this->socket->connect($timeout);
 
     // Read banner message
-    $this->expect($this->getResponse(), array(220));
+    $this->expect($this->getResponse(), [220]);
 
     // User & password
     if ($this->url->getUser()) {
       try {
-        $this->expect($this->sendCommand('USER %s', $this->url->getUser()), array(331));
-        $this->expect($this->sendCommand('PASS %s', $this->url->getPassword()), array(230));
+        $this->expect($this->sendCommand('USER %s', $this->url->getUser()), [331]);
+        $this->expect($this->sendCommand('PASS %s', $this->url->getPassword()), [230]);
       } catch (\peer\ProtocolException $e) {
         $this->socket->close();
         throw new AuthenticationException(sprintf(
@@ -118,7 +118,7 @@ public function connect() {
     $this->setupListParser();
 
     // Retrieve root directory
-    sscanf($this->expect($this->sendCommand('PWD'), array(257)), '"%[^"]"', $dir);
+    sscanf($this->expect($this->sendCommand('PWD'), [257]), '"%[^"]"', $dir);
     $this->root= new FtpDir(strtr($dir, '\\', '/'), $this);
 
     return $this;
@@ -129,7 +129,7 @@ public function connect() {
    *
    */
   protected function setupListParser() {
-    $type= $this->expect($this->sendCommand('SYST'), array(215));
+    $type= $this->expect($this->sendCommand('SYST'), [215]);
     if ('Windows_NT' == $type) {
       $this->parser= new WindowsFtpListParser();
     } else {
@@ -161,8 +161,8 @@ public function close() {
    * @return  peer.Socket
    */
   public function transferSocket() {
-    $port= $this->expect($this->sendCommand('PASV'), array(227));
-    $a= $p= array();
+    $port= $this->expect($this->sendCommand('PASV'), [227]);
+    $a= $p= [];
     sscanf($port, '%*[^(] (%d,%d,%d,%d,%d,%d)', $a[0], $a[1], $a[2], $a[3], $p[0], $p[1]);
 
     // Open transfer socket
@@ -252,7 +252,7 @@ public function listingOf($name, $options= null) {
         $transfer->close();
         return null;
       } else if (150 === $code) {   // Listing
-        $list= array();
+        $list= [];
         while ($line= $transfer->readLine()) {
           $list[]= $line;
         }
@@ -262,7 +262,7 @@ public function listingOf($name, $options= null) {
         if (450 === $code) {        // No such file or directory
           return null;
         } else {                    // Some FTP servers send an empty directory listing
-          $this->expect($r, array(226));
+          $this->expect($r, [226]);
           return $list ? $list : null;
         }
       } else {                      // Unexpected response

src/main/php/peer/ftp/FtpDir.class.php

@@ -47,7 +47,7 @@ public function entries() {
    * @throws  io.IOException in case of an I/O error
    */
   public function delete() {
-    $this->connection->expect($this->connection->sendCommand('RMD %s', $this->name), array(250));
+    $this->connection->expect($this->connection->sendCommand('RMD %s', $this->name), [250]);
   }
 
   /**
@@ -198,7 +198,7 @@ public function getDir($name) {
    * @throws  peer.ProtocolException in case the created directory cannot be located or is a file
    */
   protected function makeDir($name) {
-    $this->connection->expect($this->connection->sendCommand('MKD %s', $this->name.$name), array(257));
+    $this->connection->expect($this->connection->sendCommand('MKD %s', $this->name.$name), [257]);
 
     if (!($created= $this->findEntry($name))) {
       throw new ProtocolException('MKDIR "'.$name.'" succeeded but could not find created directory afterwards');

src/main/php/peer/ftp/FtpEntry.class.php

@@ -77,8 +77,8 @@ public function exists() {
   public function rename($to) {
     $target= ('/' === $to{0} ? $to : dirname($this->name).'/'.$to);
     try {
-      $this->connection->expect($this->connection->sendCommand('RNFR %s', $this->name), array(350));
-      $this->connection->expect($this->connection->sendCommand('RNTO %s', $target), array(250));
+      $this->connection->expect($this->connection->sendCommand('RNFR %s', $this->name), [350]);
+      $this->connection->expect($this->connection->sendCommand('RNTO %s', $target), [250]);
     } catch (\peer\ProtocolException $e) {
       throw new \io\IOException('Could not rename '.$this->name.' to '.$to.': '.$e->getMessage());
     }
@@ -93,12 +93,12 @@ public function rename($to) {
    */
   public function moveTo(FtpDir $to, $name= null) {
     try {
-      $this->connection->expect($this->connection->sendCommand('RNFR %s', $this->name), array(350));
+      $this->connection->expect($this->connection->sendCommand('RNFR %s', $this->name), [350]);
       $this->connection->expect($this->connection->sendCommand(
         'RNTO %s%s', 
         $to->getName(), 
         $name ? $name : basename($this->name)
-      ), array(250));
+      ), [250]);
     } catch (\peer\ProtocolException $e) {
       throw new \io\IOException('Could not rename '.$this->name.' to '.$to->getName().': '.$e->getMessage());
     }
@@ -134,7 +134,7 @@ public abstract function delete();
    * @throws  lang.IllegalArgumentException
    */
   public function setPermissions($perm) {
-    static $m= array('r' => 4, 'w' => 2, 'x' => 1, '-' => 0, 't' => 0);
+    static $m= ['r' => 4, 'w' => 2, 'x' => 1, '-' => 0, 't' => 0];
 
     if (is_string($perm) && 9 == strlen($perm)) {
       $this->permissions= (

src/main/php/peer/ftp/FtpEntryList.class.php

@@ -8,7 +8,7 @@
 class FtpEntryList extends \lang\Object implements \IteratorAggregate {
   protected
     $connection   = null,
-    $list         = array(),
+    $list         = [],
     $base         = '';
 
   /**
@@ -59,9 +59,9 @@ public function isEmpty() {
    * @throws  lang.FormatException in case an entry cannot be parsed
    */
   public function asArray() {
-    $dotdirs= array($this->base.'./', $this->base.'../');
+    $dotdirs= [$this->base.'./', $this->base.'../'];
 
-    for ($i= 0, $r= array(), $s= sizeof($this->list); $i < $s; $i++) {
+    for ($i= 0, $r= [], $s= sizeof($this->list); $i < $s; $i++) {
       $e= $this->connection->parser->entryFrom($this->list[$i], $this->connection, $this->base);
       in_array($e->getName(), $dotdirs) || $r[]= $e;
     }

src/main/php/peer/ftp/FtpFile.class.php

@@ -17,7 +17,7 @@ class FtpFile extends FtpEntry {
    * @throws  io.IOException in case of an I/O error
    */
   public function delete() {
-    $this->connection->expect($this->connection->sendCommand('DELE %s', $this->name), array(250));
+    $this->connection->expect($this->connection->sendCommand('DELE %s', $this->name), [250]);
   }
 
   /**

src/main/php/peer/ftp/FtpListIterator.class.php

@@ -11,7 +11,7 @@
 class FtpListIterator extends \lang\Object implements \Iterator {
   private 
     $i= 0, 
-    $v= array(), 
+    $v= [], 
     $c= null, 
     $e= null,
     $b= '';
@@ -69,7 +69,7 @@ public function rewind() {
    * @return  bool
    */
   public function valid() { 
-    $dotdirs= array($this->b.'./', $this->b.'../');
+    $dotdirs= [$this->b.'./', $this->b.'../'];
     do {
       if ($this->i >= sizeof($this->v)) return false;
 

src/main/php/peer/ftp/FtpTransfer.class.php

@@ -11,10 +11,10 @@ abstract class FtpTransfer extends \lang\Object {
   const ASCII  = 1;
   const BINARY = 2;
 
-  protected static $modes= array(
+  protected static $modes= [
     self::ASCII  => 'A',
     self::BINARY => 'I'
-  );
+  ];
 
   protected
     $remote      = null,
@@ -97,7 +97,7 @@ public function start($mode) {
     with ($conn= $this->remote->getConnection()); {
 
       // Set mode
-      $conn->expect($conn->sendCommand('TYPE %s', self::$modes[$mode]), array(200));
+      $conn->expect($conn->sendCommand('TYPE %s', self::$modes[$mode]), [200]);
 
       // Issue the transfer command
       $this->socket= $conn->transferSocket();
@@ -127,7 +127,7 @@ public function start($mode) {
   protected function close() {
     $this->socket->close();
     with ($conn= $this->remote->getConnection()); {
-      $conn->expect($conn->getResponse(), array(226));
+      $conn->expect($conn->getResponse(), [226]);
     }
   }
 

src/main/php/peer/ftp/FtpTransferStream.class.php

@@ -26,15 +26,15 @@ public function __construct(FtpFile $file) {
 
       // Always use binary mode
       // Check for "200 Type set to X"
-      $conn->expect($conn->sendCommand('TYPE I'), array(200));
+      $conn->expect($conn->sendCommand('TYPE I'), [200]);
 
       // Always use passive mode, just to be sure
       // Check for "227 Entering Passive Mode (h1,h2,h3,h4,p1,p2)."
       $this->socket= $conn->transferSocket();
 
       // Begin transfer depending on the direction returned by getCommand()
       // Check for "150 Opening XXX mode data connection for ..."
-      $conn->expect($conn->sendCommand($cmd.' '.$file->getName()), array(150));
+      $conn->expect($conn->sendCommand($cmd.' '.$file->getName()), [150]);
     }
     $this->file= $file;
   }
@@ -68,7 +68,7 @@ public function close() {
     // Reset mode to ASCII
     with ($conn= $this->file->getConnection()); {
       $r= $conn->getResponse();
-      $conn->expect($conn->sendCommand('TYPE A'), array(200));
+      $conn->expect($conn->sendCommand('TYPE A'), [200]);
       sscanf($r[0], "%d %[^\r\n]", $code, $message);
       if (226 != $code) {
         throw new \peer\ProtocolException('Transfer incomplete ('.$code.': '.$message.')');

src/main/php/peer/ftp/server/FtpProtocol.class.php

@@ -280,7 +280,7 @@ public function onCdup($socket, $params) {
    * @param   string params
    */
   public function onFeat($socket, $params) {
-    $this->answer($socket, 211, 'Features', array('MDTM', 'SIZE'));
+    $this->answer($socket, 211, 'Features', ['MDTM', 'SIZE']);
   }
 
   /**
@@ -291,7 +291,7 @@ public function onFeat($socket, $params) {
    * @param   string params
    */
   public function onHelp($socket, $params) {
-    $methods= array();
+    $methods= [];
     $i= 0;
     foreach (get_class_methods($this) as $name) {
       if (0 != strncmp('on', $name, 2) || strlen($name) > 6) continue;
@@ -445,7 +445,7 @@ public function onList($socket, $params) {
     if ($entry instanceof StorageCollection && !strstr($options, 'd')) {
       $elements= $entry->elements();
     } else {
-      $elements= array($entry);
+      $elements= [$entry];
     }
 
     $before6Months= DateUtil::addMonths(Date::now(), -6)->getTime();
@@ -511,7 +511,7 @@ public function onNlst($socket, $params) {
     if ($entry instanceof StorageCollection && !strstr($options, 'd')) {
       $elements= $entry->elements();
     } else {
-      $elements= array($entry);
+      $elements= [$entry];
     }
 
     for ($i= 0, $s= sizeof($elements); $i < $s; $i++) {
@@ -967,7 +967,7 @@ public function handleConnect($socket) {
    * @return  var
    */
   public function handleData($socket)  {
-    static $public= array('onhelp', 'onuser', 'onpass', 'onquit');
+    static $public= ['onhelp', 'onuser', 'onpass', 'onquit'];
 
     $data= $socket->readLine();      
     $this->cat && $this->cat->debug('>>> ', addcslashes($data, "\0..\17"));