Merge branch 'master' into update-fb-graph-api-14.0-and-change-field

heiseonline · Oct 25, 2023 · b6e978d · b6e978d
2 parents f9dde86 + 74386de
commit b6e978d
Show file tree

Hide file tree

Showing 25 changed files with 1,933 additions and 784 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,5 @@
 # Created by https://www.gitignore.io
-
+.idea/
 build/
 shariff-backend-php.zip
 shariff-backend-php.tar.gz
@@ -9,7 +9,7 @@ composer.phar
 vendor/
 .php_cs.cache
 
-# Commit your application's lock file http://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
-# You may choose to ignore a library lock file http://getcomposer.org/doc/02-libraries.md#lock-file
+# Commit your application's lock file https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file
+# You may choose to ignore a library lock file https://getcomposer.org/doc/02-libraries.md#lock-file
 # composer.lock
 /.phpunit.result.cache
diff --git a/.travis.yml b/.travis.yml
@@ -6,6 +6,8 @@ php:
  - 7.2
  - 7.3
  - 7.4
+ - 8.0
+ - 8.1
 
 env:
   - SHARIFF_RUN_LINT=1

diff --git a/README.md b/README.md
@@ -27,6 +27,8 @@ To run Shariff PHP Backend on your server you need one of these PHP versions:
 * 7.2
 * 7.3
 * 7.4
+* 8.0
+* 8.1
 
 Older versions and HHVM are not supported.
 
@@ -50,12 +52,12 @@ The following configuration options are available:
 
 By default Shariff uses the Filesystem cache. By specifying a different adapter from Laminas\Cache\Storage\Adapter you can tell Shariff to use another cache. Also you can specify options for that cache adapter
 
-| Key         | Type | Description |
-|-------------|------|-------------|
-| `ttl` | `integer` | Time that the counts are cached (in seconds) |
-| `cacheDir` | `string` | Directory used for the cache. Default: system temp directory |
-| `adapter` | `string` | Name of cache adapter (e.g. Apc, Memcache, etc.) |
-| `adapterOptions` | `object` | Options for the cache adapter |
+| Key         | Type | Description                                                                                                                                                                                                                                                                                                                 |
+|-------------|------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `ttl` | `integer` | Time that the counts are cached (in seconds)                                                                                                                                                                                                                                                                                |
+| `cacheDir` | `string` | Directory used for the cache. Default: system temp directory                                                                                                                                                                                                                                                                |
+| `adapter` | `string` | Name of cache adapter (e.g. Apc, Memcache, etc.) <br/>You can find an overview of all available Adapters [here](https://docs.laminas.dev/laminas-cache/v3/storage/adapter/). It is required to [install these separately](https://docs.laminas.dev/laminas-cache/v3/migration/to-version-3/#satellite-packages) through composer |
+| `adapterOptions` | `object` | Options for the cache adapter                                                                                                                                                                                                                                                                                               |
 
 *These option apply for the default Cache class (`LaminasCache`) only. If you implement custom caching, you can specify your own options.*
 
@@ -105,7 +107,10 @@ private static $configuration = [
         ]
     ],
     'client' => [
-      'timeout' => 4.2
+      'timeout' => 4.2,
+      'headers' => [
+        'User-Agent' => 'shariff/1.0',
+      ]
       // ... (see "Client options")
     ],
     'domains' => [
@@ -155,6 +160,6 @@ $options = [
 	"services" => ["Facebook", "Reddit", "StumbleUpon", "Flattr", "Pinterest", "AddThis", "Buffer", "Vk"]
 ];
 $shariff = new Backend($options);
-$counts = $shariff->get("http://www.heise.de/");
+$counts = $shariff->get("https://www.heise.de/");
 echo $counts["facebook"];
 ```
diff --git a/composer.json b/composer.json
@@ -21,13 +21,16 @@
         }
     ],
     "require": {
-        "php": "^7.2",
-        "guzzlehttp/guzzle": "^6.1",
+        "php": "^7.2 || ^8.0",
+        "guzzlehttp/guzzle": "^7.4.1",
         "psr/log": "^1.0",
-        "laminas/laminas-cache": "^2.7"
+        "laminas/laminas-cache": "^3.1",
+        "laminas/laminas-cache-storage-adapter-filesystem": "^2.0",
+        "laminas/laminas-cache-storage-adapter-memory": "^2.0",
+        "laminas/laminas-cache-storage-deprecated-factory": "^1.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^8.5"
+        "phpunit/phpunit": "^9.5"
     },
     "config": {
         "optimize-autoloader": true,
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,6 +6,8 @@ php: @@
      - 7.2
      - 7.3
      - 7.4
+     - 8.0
+     - 8.1
     env:
       - SHARIFF_RUN_LINT=1
@@ Expand Down @@