Dev (#145)

* Icon Download extended function (#131) * Update Server.php Option to Download an icon by name. This has the benefit that you don't have to change the virtualserver_icon_id to download a specific icon. * Update Server.php fixed name was not set for download * Fixing naming error (#135) * try to fix issue #136 * add -banners option to channellist * remove iconname argument use transferInitDownload() instead * add -keepfiles argument to snapshot deploy * update changelog * set release date for 1.1.34 * Fixing deprecated curly braces for PHP 7.4+ (#142) * removed deprecated curly braces from string.php, host.php, crypt.php, char.php * removed another deprecated curly braces from string.php (#144) overlooked one more curly braces * * Added Travis CI build status icon to README * Travis CI tests now also PHP 7.3 and 7.4 * Improved composer.json * Updated command to run all tests in README * Added `docker-compose up` to README for existing docker container(s) * Fixed PHPUnit config issues * Exposed ServerQuery SSH port * Switched from libssh to phpseclib * Changed requirement from PHP extension SSH to phpseclib * Fixed composer warning * #148: Fixed deprecated curly braces in PHP 7.4 * Updated composer packages Co-authored-by: Sensznet <ssensz@gmx.de> Co-authored-by: Thomas Hanke <18329992+thhan@users.noreply.github.com> Co-authored-by: Sven Paulsen <info@sven-paulsen.de> Co-authored-by: Fjonan <fjonan@fjonan.com> Co-authored-by: Sebastian Krätzig <sebastian.kraetzig@4g-server.eu>
planetteamspeak · May 18, 2020 · fa52249 · fa52249
1 parent 2cf1d5a
commit fa52249
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 39 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -11,18 +11,20 @@ php:
   - 5.6
   - 7.0
   - 7.1
+  - 7.2
+  - 7.3
   - nightly
 
 matrix:
   include:
-    - php: 7.2
+    - php: 7.4
       env: COVERAGE=yes
-    - php: 7.2
+    - php: 7.4
       env: EXECUTE_CS_CHECK=yes
   fast_finish: true
   allow_failures:
     - php: nightly
-    - php: 7.2
+    - php: 7.4
       env: EXECUTE_CS_CHECK=yes
 
 services:
@@ -33,18 +35,6 @@ cache:
     - $HOME/.composer/cache
     - $HOME/.php-cs-fixer
 
-before_install:
-  - docker run -d --name="teamspeak_server" -p "9987:9987/udp" -p 10011:10011 -p 30033:30033 teamspeak:latest
-  - docker ps -a
-  - docker logs teamspeak_server
-  - if [[ $TRAVIS_PHP_VERSION != hhvm && $TRAVIS_PHP_VERSION != nightly && $COVERAGE != yes ]]; then phpenv config-rm xdebug.ini; fi
-  - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo 'opcache.enable=1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
-  - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo 'opcache.enable_cli=1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
-  - travis_retry composer self-update
-
-install:
-  - travis_retry composer update --optimize-autoloader --prefer-dist --prefer-stable --no-progress --no-interaction
-
 before_script:
   - mkdir -p "$HOME/.php-cs-fixer"
   - cp phpunit.xml.dist phpunit.xml
@@ -58,5 +48,21 @@ script:
   - if [[ $EXECUTE_CS_CHECK == yes ]]; then php -n -d memory_limit=768M vendor/bin/php-cs-fixer fix --config=.php_cs --verbose --dry-run; fi
   - if [[ $COVERAGE == yes ]] && [ "$TRAVIS_PULL_REQUEST" == "false" ]; then ./cc-test-reporter after-build --exit-code $TRAVIS_TEST_RESULT; fi
 
+before_install:
+  - sudo apt-get install -y php-pear
+  - sudo pear channel-discover phpseclib.sourceforge.net
+  - sudo pear remote-list -c phpseclib
+  - sudo pear install phpseclib/Net_SSH2
+  - docker run -d --name="teamspeak_server" -p "9987:9987/udp" -p 10011:10011 -p 30033:30033 teamspeak:latest
+  - docker ps -a
+  - docker logs teamspeak_server
+  - if [[ $TRAVIS_PHP_VERSION != hhvm && $TRAVIS_PHP_VERSION != nightly && $COVERAGE != yes ]]; then phpenv config-rm xdebug.ini; fi
+  - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo 'opcache.enable=1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
+  - if [[ $TRAVIS_PHP_VERSION != hhvm ]]; then echo 'opcache.enable_cli=1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini; fi
+  - travis_retry composer self-update
+
+install:
+  - travis_retry composer update --optimize-autoloader --prefer-dist --prefer-stable --no-progress --no-interaction
+
 after_success:
   - travis_retry php vendor/bin/php-coveralls -v
diff --git a/CHANGELOG b/CHANGELOG
@@ -9,9 +9,11 @@
    ! Important - Take note!
 ===============================================================================
 
-=== Release 1.1.34 - WIP ===
+=== Release 1.1.34 - 04 Mar 2020 ===
  ! upgrading your servers to 3.10.0 (build >= 1564054246) is mandatory
  + added optional -continueonerror argument to some commands
+ + added optional -keepfiles argument to serversnapshotdeploy command
+ + added optional -banners argument to channellist command
  + added pagination support for banlist commands
  + added management support for ServerQuery logins
  * property client_nickname will now be set before selecting a virtual server

diff --git a/README.md b/README.md
@@ -1,5 +1,7 @@
 # TeamSpeak 3 PHP Framework
 
+[![Build Status](https://travis-ci.org/planetteamspeak/ts3phpframework.svg?branch=master)](https://travis-ci.org/planetteamspeak/ts3phpframework)
+
 Initially released in January 2010, the TS3 PHP Framework is a powerful, open source, object-oriented framework implemented in PHP 5 and licensed under the GNU General Public License. It’s based on simplicity and a rigorously tested agile codebase. Extend the functionality of your servers with scripts or create powerful web applications to manage all features of your TeamSpeak 3 Server instances.
 
 Tested. Thoroughly. Enterprise-ready and built with agile methods, the TS3 PHP Framework has been unit-tested from the start to ensure that all code remains stable and easy for you to extend, re-test with your extensions, and further maintain.
@@ -28,7 +30,7 @@ Speed up new development and reduce maintenance costs by using this nifty piece
 
 **Requirements**
 
-* PHP - Developed on PHP 7.x, with 7.2.x targeted for testing.
+* PHP - Developed on PHP 7.x, with 7.4.x targeted for testing.
 * TeamSpeak Server - v3.4.0 (build >= 1536564584) or higher.
 
 **Often used with...**
@@ -54,7 +56,7 @@ composer require planetteamspeak/ts3-php-framework:dev-master
 
 ### Tests
 
-To run all tests use `php vendor/bin/phpunit`.
+To run all tests use `composer run tests`.
 
 ### Useful Links
 
@@ -249,6 +251,10 @@ Setup a local test instance of TeamSpeak3 (amd64, Alpine Linux):
 ```
 docker run --name teamspeak_server -p 9987:9987/udp -p 10011:10011 -p 30033:30033 -e TS3SERVER_LICENSE=accept teamspeak:latest
 ```
+Or simply start the predefined docker container `docker-compose.yml`:
+```
+docker-compose up
+```
 _Add `-d` flag to run in background. Options / Examples: [Docs @ Docker](https://docs.docker.com/samples/library/teamspeak/) | [Hub @ Docker](https://hub.docker.com/_/teamspeak/)_
 
 Use full docker stack to deploy TeamSpeak 3 with Maria DB:

diff --git a/composer.json b/composer.json
@@ -16,32 +16,41 @@
     "issues": "https://github.com/planetteamspeak/ts3phpframework/issues",
     "docs": "https://docs.planetteamspeak.com/ts3/php/framework"
   },
+  "config": {
+    "sort-packages": true
+  },
   "require": {
     "php": ">=5.6",
     "ext-json": "*",
     "ext-ctype": "*",
-    "ext-ssh2": "*",
+    "phpseclib/phpseclib": "^1.0",
     "ext-openssl": "*"
   },
   "require-dev": {
-    "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0 || ^7.0",
-    "satooshi/php-coveralls": "^1.1 || ^2.0",
+    "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4",
     "friendsofphp/php-cs-fixer": "^2.0.0",
+    "php-coveralls/php-coveralls": "^2.2",
+    "phpcompatibility/php-compatibility": "^8.2",
+    "phpunit/phpunit": "^4.8.35 || ^5.4.3 || ^6.0 || ^7.0",
     "react/socket": "^0.8.5",
-    "symfony/yaml": "~2.1|~3.0|~4.0",
     "squizlabs/php_codesniffer": "^3.3",
-    "phpcompatibility/php-compatibility": "^8.2",
-    "dealerdirect/phpcodesniffer-composer-installer": "^0.4.4"
+    "symfony/yaml": "~2.1|~3.0|~4.0"
   },
   "autoload": {
     "psr-4": {
-      "PlanetTeamSpeak\\TeamSpeak3Framework\\": "src/",
+      "PlanetTeamSpeak\\TeamSpeak3Framework\\": "src/"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
       "PlanetTeamSpeak\\TeamSpeak3Framework\\Tests\\": "tests/"
     }
   },
   "scripts": {
-    "compatibility": "./vendor/bin/phpcs -ps --basepath=. --standard=PHPCompatibility --runtime-set testVersion 5.2- src",
-    "test": "./vendor/bin/phpunit --no-coverage ./tests",
-    "coverage": "./vendor/bin/phpunit"
+    "compatibility": "\"vendor/bin/phpcs\" -ps --basepath=. --standard=PHPCompatibility --runtime-set testVersion 5.2- src",
+    "tests": [
+      "\"vendor/bin/phpunit\" --no-coverage"
+    ],
+    "coverage": "\"vendor/bin/phpunit\""
   }
 }
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -6,6 +6,7 @@ services:
     ports:
       - 9987:9987/udp
       - 10011:10011
+      - 10022:10022
       - 30033:30033
     environment:
       TS3SERVER_DB_PLUGIN: ts3db_mariadb

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -8,7 +8,6 @@
          convertWarningsToExceptions="true"
          processIsolation="false"
          stopOnFailure="false"
-         syntaxCheck="false"
 >
   <testsuites>
     <testsuite name="Teamspeak 3 PHP Framework Test Suite">
@@ -18,7 +17,7 @@
 
   <logging>
     <log type="coverage-clover" target="build/logs/clover.xml"/>
-    <log type="junit" target="build/logs/junit.xml" logIncompleteSkipped="false"/>
+    <log type="junit" target="build/logs/junit.xml"/>
   </logging>
 
   <filter>

diff --git a/src/Helper/Char.php b/src/Helper/Char.php
@@ -183,18 +183,18 @@ public function toAscii()
      */
     public function toUnicode()
     {
-        $h = ord($this->char{0});
+        $h = ord($this->char[0]);
 
         if ($h <= 0x7F) {
             return $h;
         } elseif ($h < 0xC2) {
             return false;
         } elseif ($h <= 0xDF) {
-            return ($h & 0x1F) << 6 | (ord($this->char{1}) & 0x3F);
+            return ($h & 0x1F) << 6 | (ord($this->char[1]) & 0x3F);
         } elseif ($h <= 0xEF) {
-            return ($h & 0x0F) << 12 | (ord($this->char{1}) & 0x3F) << 6 | (ord($this->char{2}) & 0x3F);
+            return ($h & 0x0F) << 12 | (ord($this->char[1]) & 0x3F) << 6 | (ord($this->char[2]) & 0x3F);
         } elseif ($h <= 0xF4) {
-            return ($h & 0x0F) << 18 | (ord($this->char{1}) & 0x3F) << 12 | (ord($this->char{2}) & 0x3F) << 6 | (ord($this->char{3}) & 0x3F);
+            return ($h & 0x0F) << 18 | (ord($this->char[1]) & 0x3F) << 12 | (ord($this->char[2]) & 0x3F) << 6 | (ord($this->char[3]) & 0x3F);
         } else {
             return false;
         }

diff --git a/src/Helper/Crypt.php b/src/Helper/Crypt.php
@@ -171,7 +171,7 @@ protected function setSecretKey($passphrase)
         for ($i = 0; $i < 18; $i++) {
             $data = 0;
             for ($j = 4; $j > 0; $j--) {
-                $data = $data << 8 | ord($passphrase{$k});
+                $data = $data << 8 | ord($passphrase[$k]);
                 $k = ($k + 1) % $length;
             }
             $this->p[$i] ^= $data;

diff --git a/src/Helper/StringHelper.php b/src/Helper/StringHelper.php
@@ -883,7 +883,7 @@ public function key()
      */
     public function current()
     {
-        return new Char($this->string{$this->position});
+        return new Char($this->string[$this->position]);
     }
 
     /**
@@ -907,7 +907,7 @@ public function offsetExists($offset)
      */
     public function offsetGet($offset)
     {
-        return ($this->offsetExists($offset)) ? new Char($this->string{$offset}) : null;
+        return ($this->offsetExists($offset)) ? new Char($this->string[$offset]) : null;
     }
 
     /**
@@ -919,7 +919,7 @@ public function offsetSet($offset, $value)
             return;
         }
 
-        $this->string{$offset} = strval($value);
+        $this->string[$offset] = strval($value);
     }
 
     /**

diff --git a/src/Node/Host.php b/src/Node/Host.php
@@ -543,7 +543,7 @@ public function permissionTree()
             $permtree[$val]["permcatid"]      = $val;
             $permtree[$val]["permcathex"]     = "0x" . dechex($val);
             $permtree[$val]["permcatname"]    = StringHelper::factory(Convert::permissionCategory($val));
-            $permtree[$val]["permcatparent"]  = $permtree[$val]["permcathex"]{3} == 0 ? 0 : hexdec($permtree[$val]["permcathex"]{2} . 0);
+            $permtree[$val]["permcatparent"]  = $permtree[$val]["permcathex"][3] == 0 ? 0 : hexdec($permtree[$val]["permcathex"][2] . 0);
             $permtree[$val]["permcatchilren"] = 0;
             $permtree[$val]["permcatcount"]   = 0;