CleanUp before Refactoring (#3)

Author: WorksDev

.github/workflows/php.yml

@@ -0,0 +1,42 @@
+name: tests
+
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
+
+jobs:
+  build:
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: ['ubuntu-latest']
+        php-versions: [7.4, 8.0]
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: soap
+
+      - name: Validate composer.json and composer.lock
+        run: composer validate
+
+      - name: Cache Composer packages
+        id: composer-cache
+        uses: actions/cache@v2
+        with:
+          path: vendor
+          key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-php-
+
+      - name: Install dependencies
+        run: composer install --prefer-dist --no-progress --no-suggest
+
+      - name: Run test suite
+        run: vendor/bin/codecept run

composer.json

@@ -10,18 +10,19 @@
   "type": "library",
   "license": "MIT",
   "require": {
-    "php": ">=5.5.0",
-    "ext-sqlite3": "*",
-    "guzzlehttp/guzzle": "^6.2",
-    "monolog/monolog": "^1.20 || ^2"
+    "php": "^7.4 || ^8",
+    "ext-sqlite3": "*"
   },
   "require-dev": {
-    "codeception/codeception": "^3"
+    "codeception/codeception": "^4"
   },
   "minimum-stability": "dev",
   "autoload": {
     "psr-4": {
       "Udger\\": "src/"
     }
+  },
+  "scripts": {
+    "test": "vendor/bin/codecept run"
   }
 }

examples/account.php

@@ -8,21 +8,20 @@
  *
  * @author tiborb
  */
-class IP implements IPInterface{
+class IP implements IPInterface
+{
 
     /**
      * Get IP verison
-     * 
+     *
      * @param string $ip
      * @return integer|boolean Returns version or false on invalid address
      */
     public function getIpVersion($ip)
     {
         if (false !== filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV6)) {
             return self::IPv6;
-        }
-
-        else if (false !== filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
+        } elseif (false !== filter_var($ip, FILTER_VALIDATE_IP, FILTER_FLAG_IPV4)) {
             return self::IPv4;
         }
         // invalid ip
@@ -31,7 +30,7 @@ public function getIpVersion($ip)
 
     /**
      * Ip to long
-     * 
+     *
      * @param string $ip
      * @return integer
      */
@@ -43,22 +42,23 @@ public function getIpLong($ip)
 
     /**
      * Ipv6 to array
-     * 
+     *
      * @param string $ip
      * @return array
      */
-    public function getIp6array($ip){
-      // expand - example: "2600:3c00::" ->  "2600:3c00:0000:0000:0000:0000:0000:0000"
-      $hex = unpack("H*hex", inet_pton($ip));         
-      $ipStr = substr(preg_replace("/([A-f0-9]{4})/", "$1:", $hex['hex']), 0, -1);
+    public function getIp6array($ip)
+    {
+        // expand - example: "2600:3c00::" ->  "2600:3c00:0000:0000:0000:0000:0000:0000"
+        $hex = unpack("H*hex", inet_pton($ip));
+        $ipStr = substr(preg_replace("/([A-f0-9]{4})/", "$1:", $hex['hex']), 0, -1);
 
-      $ipIntArray = array();
-      $ipStrArray = explode(":", $ipStr);
+        $ipIntArray = array();
+        $ipStrArray = explode(":", $ipStr);
 
-      foreach ($ipStrArray as &$value) {
-        $ipIntArray[] = hexdec($value);
-      }
+        foreach ($ipStrArray as &$value) {
+            $ipIntArray[] = hexdec($value);
+        }
 
-      return $ipIntArray;
+        return $ipIntArray;
     }
 }

examples/parse.php

@@ -6,8 +6,8 @@
  *
  * @author tiborb
  */
-interface IPInterface {
-
+interface IPInterface
+{
     const IPv4 = 4;
     const IPv6 = 6;