v0.9.16

kristuff · web-flow · commit 66be91c7d30f · 2021-11-28T16:53:27.000+01:00
diff --git a/README.md b/README.md
@@ -6,7 +6,7 @@
 [![Latest Stable Version](https://poser.pugx.org/kristuff/abuseipdb-cli/v/stable)](https://packagist.org/packages/kristuff/abuseipdb-cli)
 [![License](https://poser.pugx.org/kristuff/abuseipdb-cli/license)](https://packagist.org/packages/kristuff/abuseipdb-cli)
 
-[![sample-report](doc/sample-report.gif)](https://kristuff.fr/projects/abuseipdbcli)
+[![sample-report](doc/sample-check.gif)](https://kristuff.fr/projects/abuseipdbcli)
 
 Features
 --------
@@ -25,7 +25,7 @@ Requirements
 - PHP >= 7.1
 - PHP's cURL  
 - A valid [abuseipdb.com](https://abuseipdb.com) account with an API key
-- Composer for install
+- Composer for install (not required if you install the `.deb` package)
 
 Dependencies
 ------------
diff --git a/bin/abuseipdb b/bin/abuseipdb
@@ -14,7 +14,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    0.9.15
+ * @version    0.9.16
  * @copyright  2020-2021 Kristuff
  */
 
diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "kristuff/abuseipdb-cli",
     "description": "A CLI tool to check/report IP addresses, download blacklist with AbuseIPDB API V2",
     "keywords": ["abuseIPDB", "API", "Client"],
-    "type": "library",
+    "type": "project",
     "license": "MIT",
     "authors": [
         {
@@ -17,9 +17,6 @@
         "kristuff/mishell": "^1.5-stable",
         "kristuff/abuseipdb": "^0.9.13-stable"
     },
-    "bin": [
-        "bin/abuseipdb"
-    ],
     "autoload": {
         "psr-4": {
             "Kristuff\\AbuseIPDB\\": "src/"
diff --git a/config/conf.ini b/config/conf.ini
@@ -4,13 +4,13 @@
 ;  \__,_|_.__/\_,_/__/\___|___|_| |___/|___/
 ;  
 ;  Kristuff\AbuseIPDB-client configuration file.
-;  v0.9.15 | (c) Kristuff <kristuff@kristuff.fr>
+;  v0.9.16 | (c) Kristuff <kristuff@kristuff.fr>
 
 ; -----------------------------------------------------------
 ; WARNING:  In most of the cases you should not modify this                    
 ;           file, but provide customizations in a local.ini 
 ;           file under this directory. In case package is 
-;           installed globally, this prevents to lost changes 
+;           installed globally, this prevents to loose changes 
 ;           during update.                        
 ; -----------------------------------------------------------
 
diff --git a/create_package.sh b/create_package.sh
@@ -21,13 +21,15 @@ cp -R bin                debian/usr/lib/abuseipdb-client
 cp -R src                debian/usr/lib/abuseipdb-client
 cp -R vendor             debian/usr/lib/abuseipdb-client
 
-# Packages should't be updated manually, do not deploy composer files.
-#cp composer.json        debian/usr/lib/abuseipdb-client
-#cp composer.lock        debian/usr/lib/abuseipdb-client
+# Packages should't be updated manually, but keep all source code..
+cp composer.json        debian/usr/lib/abuseipdb-client
+cp composer.lock        debian/usr/lib/abuseipdb-client
 
 # adjust ownerships
 chown -R root:root      debian
 chmod -R 0755           debian/usr/lib/abuseipdb-client
+chmod 0755              debian/etc/abuseipdb-client
+chmod 0644              debian/etc/abuseipdb-client/conf.ini
 
 # minimal permissions required for scripts
 chmod 755 debian/DEBIAN/postinst
diff --git a/deb/control b/deb/control
@@ -1,5 +1,5 @@
 Package: abuseipdb-client
-Version: 0.9.15
+Version: 0.9.16
 Maintainer: kristuff <kristuff@kristuff.fr>
 Architecture: all
 Depends: php, php-curl
diff --git a/doc/categories.png b/doc/categories.png
diff --git a/doc/help.png b/doc/help.png
diff --git a/doc/sample-check-bad-ip.png b/doc/sample-check-bad-ip.png
diff --git a/doc/sample-check.gif b/doc/sample-check.gif
diff --git a/doc/sample-install.png b/doc/sample-install.png
diff --git a/doc/sample-report.gif b/doc/sample-report.gif
diff --git a/src/AbstractClient.php b/src/AbstractClient.php
@@ -13,7 +13,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    0.9.15
+ * @version    0.9.16
  * @copyright  2020-2021 Kristuff
  */
 namespace Kristuff\AbuseIPDB;
@@ -41,7 +41,7 @@ abstract class AbstractClient extends ShellErrorHandler
     /**
      * @var string
      */
-    const VERSION = 'v0.9.15'; 
+    const VERSION = 'v0.9.16'; 
 
     /**
      * @var QuietApiHandler
@@ -82,7 +82,7 @@ abstract class AbstractClient extends ShellErrorHandler
      * @static
      * @param array     $arguments   
      * 
-     * @return bool     true is the command has been found, otherwise false
+     * @return bool     true if the command has been found, otherwise false
      */
     protected static function parseCommand(array $arguments): bool
     {
@@ -111,14 +111,13 @@ protected static function parseCommand(array $arguments): bool
      * @param array         $arguments      The list of arguments     
      * 
      * @return void   
-     * 
      */
     protected static function setOutputFormat(array $arguments): void
     {
         $given = self::getArgumentValue($arguments, 'o', 'output') ?? 'default';
         $output = empty($given) ? 'default' : $given; 
         self::validate(in_array($output, ['default', 'json', 'plaintext']), 'Invalid output argument given.');
-        self::$outputFormat = $output ;
+        self::$outputFormat = $output;
     }
 
     /**
@@ -128,8 +127,6 @@ protected static function setOutputFormat(array $arguments): void
      * @static
      * 
      * @return void
-     * @throws \InvalidArgumentException                        If the given file does not exist
-     * @throws \Kristuff\AbuseIPDB\InvalidPermissionException   If the given file is not readable 
      */
     protected static function createHandler(): void
     {
@@ -159,16 +156,16 @@ protected static function createHandler(): void
      * @access protected 
      * @static
      * @param array    $conf        The main configuration array
-     * @param array    $local       The local configuration array
+     * @param array    $localConf   The local configuration array
      * 
      * @return array
      */
     protected static function extractSelfIpsFromConf(array $conf, array $localConf): array
     {
-        if (array_key_exists('self_ips', $localConf)){
+        if (array_key_exists('self_ips', $localConf) && !empty($localConf['self_ips'])){
             return array_map('trim', explode(',', $localConf['self_ips']));
         }
-        if (array_key_exists('self_ips', $conf)){
+        if (array_key_exists('self_ips', $conf) && !empty($conf['self_ips'])){
             return array_map('trim', explode(',', $conf['self_ips']));
         }
         return [];
@@ -179,11 +176,13 @@ protected static function extractSelfIpsFromConf(array $conf, array $localConf):
      * 
      * @access protected 
      * @static
-     * @param array    $conf        The configuration array
+     * @param array    $conf        The main configuration array
+     * @param array    $localConf   The local configuration array
      * 
-     * @return array
+     * @return string
+     * @throws \RuntimeException                                
      */
-    protected static function extractApiKeyFromConf(array $conf, $localConf): string
+    protected static function extractApiKeyFromConf(array $conf, array $localConf): string
     {
         $key = '';
 
diff --git a/src/AbuseIPDBClient.php b/src/AbuseIPDBClient.php
@@ -13,7 +13,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    0.9.15
+ * @version    0.9.16
  * @copyright  2020-2021 Kristuff
  */
 namespace Kristuff\AbuseIPDB;
diff --git a/src/BulkReportTrait.php b/src/BulkReportTrait.php
@@ -13,7 +13,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    0.9.15
+ * @version    0.9.16
  * @copyright  2020-2021 Kristuff
  */
 namespace Kristuff\AbuseIPDB;
diff --git a/src/CheckBlockTrait.php b/src/CheckBlockTrait.php
@@ -13,7 +13,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    0.9.15
+ * @version    0.9.16
  * @copyright  2020-2021 Kristuff
  */
 namespace Kristuff\AbuseIPDB;
diff --git a/src/CheckTrait.php b/src/CheckTrait.php
@@ -13,7 +13,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    0.9.15
+ * @version    0.9.16
  * @copyright  2020-2021 Kristuff
  */
 namespace Kristuff\AbuseIPDB;
diff --git a/src/ShellErrorHandler.php b/src/ShellErrorHandler.php
@@ -13,7 +13,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    0.9.15
+ * @version    0.9.16
  * @copyright  2020-2021 Kristuff
  */
 namespace Kristuff\AbuseIPDB;
diff --git a/src/ShellUtils.php b/src/ShellUtils.php
@@ -13,7 +13,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    0.9.15
+ * @version    0.9.16
  * @copyright  2020-2021 Kristuff
  */
 namespace Kristuff\AbuseIPDB;
diff --git a/src/UtilsTrait.php b/src/UtilsTrait.php
@@ -13,7 +13,7 @@
  * For the full copyright and license information, please view the LICENSE
  * file that was distributed with this source code.
  *
- * @version    0.9.15
+ * @version    0.9.16
  * @copyright  2020-2021 Kristuff
  */
 namespace Kristuff\AbuseIPDB;

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`	`* For the full copyright and license information, please view the LICENSE`
`15`	`15`	`* file that was distributed with this source code.`
`16`	`16`	`*`
`17`		`- * @version 0.9.15`
	`17`	`+ * @version 0.9.16`
`18`	`18`	`* @copyright 2020-2021 Kristuff`
`19`	`19`	`*/`
`20`	`20`