Format code

bear8421 · Aug 25, 2024 · 8990e27 · 8990e27
1 parent de90161
commit 8990e27
Show file tree

Hide file tree

Showing 6 changed files with 86 additions and 85 deletions.
diff --git a/.github/workflows/php.yml b/.github/workflows/php.yml
@@ -2,30 +2,30 @@
 name: Testing PHP Plugins Gravatar by Bear
 on: [ push, pull_request ]
 jobs:
-    build:
-        strategy:
-            matrix:
-                operating-system: [ 'ubuntu-latest', 'ubuntu-20.04', 'ubuntu-22.04', 'macos-latest', 'macos-11', 'macos-12' ]
-                php-versions: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
-        runs-on: ${{ matrix.operating-system }}
-        steps:
-            -   name: Checkout
-                uses: actions/checkout@v3
-            -   name: Setup PHP, with composer and extensions
-                uses: shivammathur/setup-php@v2 # From https://github.com/shivammathur/setup-php
-                with:
-                    php-version: ${{ matrix.php-versions }}
-                    extensions: mbstring, intl, curl, json, openssl, iconv, bcmath, xml
-            -   name: Get composer cache directory
-                id: composer-cache
-                run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
-            -   name: Cache dependencies
-                uses: actions/cache@v3
-                with:
-                    path: ${{ steps.composer-cache.outputs.dir }}
-                    key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
-                    restore-keys: ${{ runner.os }}-composer-
-            -   name: Install dependencies
-                run: composer install --no-dev --no-progress --prefer-dist --optimize-autoloader
-            -   name: Test Gravatar with user nguyenanhung
-                run: php ./test/test.php
+  build:
+    strategy:
+      matrix:
+        operating-system: [ 'ubuntu-latest', 'ubuntu-20.04', 'ubuntu-22.04', 'macos-latest', 'macos-11', 'macos-12' ]
+        php-versions: [ '5.6', '7.0', '7.1', '7.2', '7.3', '7.4', '8.0', '8.1', '8.2' ]
+    runs-on: ${{ matrix.operating-system }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v3
+      - name: Setup PHP, with composer and extensions
+        uses: shivammathur/setup-php@v2 # From https://github.com/shivammathur/setup-php
+        with:
+          php-version: ${{ matrix.php-versions }}
+          extensions: mbstring, intl, curl, json, openssl, iconv, bcmath, xml
+      - name: Get composer cache directory
+        id: composer-cache
+        run: echo "dir=$(composer config cache-files-dir)" >> $GITHUB_OUTPUT
+      - name: Cache dependencies
+        uses: actions/cache@v3
+        with:
+          path: ${{ steps.composer-cache.outputs.dir }}
+          key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.json') }}
+          restore-keys: ${{ runner.os }}-composer-
+      - name: Install dependencies
+        run: composer install --no-dev --no-progress --prefer-dist --optimize-autoloader
+      - name: Test Gravatar with user nguyenanhung
+        run: php ./test/test.php
diff --git a/composer.json b/composer.json
@@ -1,36 +1,36 @@
 {
-    "name": "bear8421/gravatar",
-    "type": "library",
-    "description": "Simple Gravatar",
-    "keywords": [
-        "gravatar",
-        "bear",
-        "helper",
-        "php"
-    ],
-    "homepage": "https://github.com/bear8421/gravatar",
-    "license": "MIT",
-    "minimum-stability": "stable",
-    "authors": [
-        {
-            "name": "Nguyen An Hung",
-            "email": "[email protected]",
-            "homepage": "https://nguyenanhung.com",
-            "role": "Developer"
-        }
-    ],
-    "require": {
-        "php": ">=5.6",
-        "ext-curl": "*",
-        "ext-json": "*",
-        "nguyenanhung/php-file-cache": "^1.0"
-    },
-    "autoload": {
-        "psr-4": {
-            "Bear8421\\Helper\\Gravatar\\": "src/"
-        },
-        "files": [
-            "helpers/helpers.php"
-        ]
+  "name": "bear8421/gravatar",
+  "type": "library",
+  "description": "Simple Gravatar",
+  "keywords": [
+    "gravatar",
+    "bear",
+    "helper",
+    "php"
+  ],
+  "homepage": "https://github.com/bear8421/gravatar",
+  "license": "MIT",
+  "minimum-stability": "stable",
+  "authors": [
+    {
+      "name": "Nguyen An Hung",
+      "email": "[email protected]",
+      "homepage": "https://nguyenanhung.com",
+      "role": "Developer"
     }
+  ],
+  "require": {
+    "php": ">=5.6",
+    "ext-curl": "*",
+    "ext-json": "*",
+    "nguyenanhung/php-file-cache": "^1.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "Bear8421\\Helper\\Gravatar\\": "src/"
+    },
+    "files": [
+      "helpers/helpers.php"
+    ]
+  }
 }
diff --git a/helpers/helpers.php b/helpers/helpers.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Project my-gravatar
  * Created by PhpStorm
@@ -7,13 +8,13 @@
  * Date: 09/08/2021
  * Time: 07:33
  */
-if (!function_exists('gravatarUrlWithUsername')) {
+if ( ! function_exists('gravatarUrlWithUsername')) {
     /**
      * Function gravatarUrlWithUsername
      *
-     * @param string $username  Username on Gravatar you need Get
-     * @param int    $size      Sizing of Gravatar Output
-     * @param string $cachePath /your/to/path for Save Cache
+     * @param  string  $username  Username on Gravatar you need Get
+     * @param  int  $size  Sizing of Gravatar Output
+     * @param  string  $cachePath  /your/to/path for Save Cache
      *
      * @return string|null
      * @author   : 713uk13m <[email protected]>
@@ -28,16 +29,15 @@ function gravatarUrlWithUsername($username = 'nguyenanhung', $size = 300, $cache
             $gravatar->setCacheStatus(true)->setCachePath($cachePath);
         }
         $gravatar->init();
-
         return $gravatar->showAvatar($size);
     }
 }
-if (!function_exists('gravatarUrlWithEmail')) {
+if ( ! function_exists('gravatarUrlWithEmail')) {
     /**
      * Function gravatarUrlWithEmail
      *
-     * @param string $email
-     * @param int    $size
+     * @param  string  $email
+     * @param  int  $size
      *
      * @return string
      * @author   : 713uk13m <[email protected]>
@@ -47,7 +47,6 @@ function gravatarUrlWithUsername($username = 'nguyenanhung', $size = 300, $cache
     function gravatarUrlWithEmail($email = '[email protected]', $size = 300)
     {
         $email = md5($email);
-
         return 'https://www.gravatar.com/avatar/' . $email . '?s=' . $size;
     }
 }
diff --git a/src/Gravatar.php b/src/Gravatar.php
@@ -26,7 +26,7 @@ class Gravatar
 
     const USER_PATTERN = '{{username}}';
 
-    const JSON_LINK = 'https://vi.gravatar.com/{{username}}.json';
+    const JSON_LINK = 'https://gravatar.com/{{username}}.json';
 
     /** @var string $username */
     protected $username = 'nguyenanhung';

diff --git a/src/Helper.php b/src/Helper.php
@@ -22,9 +22,9 @@ trait Helper
     /**
      * Function sendRequest
      *
-     * @param string $url
-     * @param array  $params
-     * @param int    $timeout
+     * @param  string  $url
+     * @param  array  $params
+     * @param  int  $timeout
      *
      * @return bool|string
      * @author   : 713uk13m <[email protected]>
@@ -34,23 +34,22 @@ trait Helper
     protected function sendRequest($url = '', $params = array(), $timeout = 30)
     {
         $endpoint = $url . '?' . http_build_query($params);
-        $curl     = curl_init();
+        $curl = curl_init();
         curl_setopt_array($curl, array(
-            CURLOPT_URL            => $endpoint,
+            CURLOPT_URL => $endpoint,
             CURLOPT_RETURNTRANSFER => true,
-            CURLOPT_ENCODING       => "",
-            CURLOPT_MAXREDIRS      => 10,
-            CURLOPT_TIMEOUT        => $timeout,
+            CURLOPT_ENCODING => "",
+            CURLOPT_MAXREDIRS => 10,
+            CURLOPT_TIMEOUT => $timeout,
             CURLOPT_FOLLOWLOCATION => true,
-            CURLOPT_SSLVERSION     => CURL_SSLVERSION_TLSv1_2,
-            CURLOPT_CUSTOMREQUEST  => "GET",
-            CURLOPT_HTTPHEADER     => array(
+            CURLOPT_SSLVERSION => CURL_SSLVERSION_TLSv1_2,
+            CURLOPT_CUSTOMREQUEST => "GET",
+            CURLOPT_HTTPHEADER => array(
                 'User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/14.1.2 Safari/605.1.15'
             ),
         ));
         $result = curl_exec($curl);
         curl_close($curl);
-
         return $result;
     }
 }
diff --git a/test/test.php b/test/test.php
@@ -1,6 +1,7 @@
 <?php
+
 /**
- * Project spreadsheets-basic
+ * Project gravatar
  * Created by PhpStorm
  * User: 713uk13m <[email protected]>
  * Copyright: 713uk13m <[email protected]>
@@ -12,9 +13,11 @@
 use Bear8421\Helper\Gravatar\Gravatar;
 
 $gravatar = new Gravatar();
-$gravatar->setUsername('nguyenanhung')->setCacheStatus(true)->setCachePath(__DIR__ . '/../tmp')->init();
+$gravatar->setUsername('nguyenanhung')
+    ->setCacheStatus(true)
+    ->setCachePath(__DIR__ . '/../tmp')->init();
 
 echo "Avatar URL: " . $gravatar->showAvatar(300) . PHP_EOL;
-echo "Avatar Data: " . json_encode($gravatar->getData()) . PHP_EOL;
+echo "Avatar Data: " . json_encode($gravatar->getData(), JSON_PRETTY_PRINT | JSON_UNESCAPED_UNICODE | JSON_UNESCAPED_SLASHES) . PHP_EOL;
 echo "Avatar Properties: " . json_encode($gravatar->getProperties()) . PHP_EOL;
 echo "Get Gravatar with Email: " . gravatarUrlWithEmail() . PHP_EOL;