Merge branch 'code-lts:main' into main

Author: c0013r

.gitattributes

@@ -2,3 +2,5 @@
 /.github export-ignore
 /.gitattributes export-ignore
 /.gitignore export-ignore
+/scripts export-ignore
+/doc export-ignore

.github/workflows/tests.yml

@@ -11,7 +11,7 @@ jobs:
                 php-version: ["5.5", "5.6", "7.1", "7.2", "7.3", "7.4", "8.0"]
                 os: [ubuntu-latest]
         steps:
-            - uses: actions/checkout@v1
+            - uses: actions/checkout@v2
             - name: Use php ${{ matrix.php-version }}
               uses: shivammathur/setup-php@v2
               with:

CHANGELOG.md

@@ -4,14 +4,26 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-## [v1.x.x]
+## [v1.6.2] - 2021-04-03
+
+- Set FCMManager::getContainer public
+
+## [v1.6.1]
+
+- Fix PHP 8.0 support
+
+## [v1.6.0]
 
 - Support laravel 8
 - Support `illuminate/support` 8
 - Support `guzzlehttp/guzzle` 7
 - Add support for setDirectBootOk on OptionsBuilder
 - Mark setDryRun as deprecated v1 FCM on OptionsBuilder
 - Add Topics Creation And Subscription
+- Drop dev dependency `mockery/mockery`
+- Update rendered documentation
+- Exclude `doc` folder from composer tarballs
+- Add support for fcmOptions (#3)
 
 ## [v1.5.0]
 

README.md

@@ -23,17 +23,17 @@ It currently **only supports HTTP protocol** for :
 
 To get the latest version of Laravel-FCM on your project, require it from "composer":
 
-```bash
+```sh
 composer require code-lts/laravel-fcm
 ```
 
 Or you can add it directly in your composer.json file:
 
 ```json
 {
-    "require": {
-        "code-lts/laravel-fcm": "1.5.*"
-    }
+	"require": {
+		"code-lts/laravel-fcm": "1.6.*"
+	}
 }
 ```
 
@@ -66,9 +66,9 @@ Add the facade aliases in the same file:
 
 Publish the package config file using the following command:
 
-
-	$ php artisan vendor:publish --provider="LaravelFCM\FCMServiceProvider"
-
+```sh
+$ php artisan vendor:publish --provider="LaravelFCM\FCMServiceProvider"
+```
 
 ### Lumen
 
@@ -135,7 +135,7 @@ $optionBuilder->setTimeToLive(60*20);
 
 $notificationBuilder = new PayloadNotificationBuilder('my title');
 $notificationBuilder->setBody('Hello world')
-				    ->setSound('default');
+					->setSound('default');
 
 $dataBuilder = new PayloadDataBuilder();
 $dataBuilder->addData(['a_data' => 'my_data']);
@@ -173,7 +173,7 @@ $optionBuilder->setTimeToLive(60*20);
 
 $notificationBuilder = new PayloadNotificationBuilder('my title');
 $notificationBuilder->setBody('Hello world')
-				    ->setSound('default');
+					->setSound('default');
 
 $dataBuilder = new PayloadDataBuilder();
 $dataBuilder->addData(['a_data' => 'my_data']);
@@ -223,7 +223,7 @@ use LaravelFCM\Message\Topics;
 ```php
 $notificationBuilder = new PayloadNotificationBuilder('my title');
 $notificationBuilder->setBody('Hello world')
-				    ->setSound('default');
+					->setSound('default');
 
 $notification = $notificationBuilder->build();
 
@@ -249,7 +249,7 @@ It sends notification to devices registered at the following topics:
 ```php
 $notificationBuilder = new PayloadNotificationBuilder('my title');
 $notificationBuilder->setBody('Hello world')
-				    ->setSound('default');
+					->setSound('default');
 
 $notification = $notificationBuilder->build();
 
@@ -303,7 +303,7 @@ $key = FCMTopic::unsubscribeTopic($topic_id, $recipients_tokens);
 
 $notificationBuilder = new PayloadNotificationBuilder('my title');
 $notificationBuilder->setBody('Hello world')
-                        ->setSound('default');
+						->setSound('default');
 
 $notification = $notificationBuilder->build();
 
@@ -361,7 +361,7 @@ You can construct an option as follows:
 $optionsBuilder = new OptionsBuilder();
 
 $optionsBuilder->setTimeToLive(42*60)
-                ->setCollapseKey('a_collapse_key');
+				->setCollapseKey('a_collapse_key');
 
 $options = $optionsBuilder->build();
 ```
@@ -381,9 +381,9 @@ See the [official documentation](https://firebase.google.com/docs/cloud-messagin
 ```php
 $notificationBuilder = new PayloadNotificationBuilder();
 $notificationBuilder->setTitle('title')
-            		->setBody('body')
-            		->setSound('sound')
-            		->setBadge('badge');
+					->setBody('body')
+					->setSound('sound')
+					->setBadge('badge');
 
 $notification = $notificationBuilder->build();
 ```
@@ -429,9 +429,9 @@ For topics message, Laravel-FCM offers an easy to use api which abstract firebas
 $topics = new Topics();
 
 $topics->topic('TopicA')
-       ->andTopic(function($condition) {
-	       $condition->topic('TopicB')->orTopic('TopicC');
-       });
+	   ->andTopic(function($condition) {
+		   $condition->topic('TopicB')->orTopic('TopicC');
+	   });
 ```
 
 ## Validating
@@ -440,7 +440,7 @@ $topics->topic('TopicA')
 
 ```php
 $isValid = FCMValidator::validateToken($token);
-``` 
+```
 
 ## Testing
 
@@ -455,8 +455,8 @@ There are 3 kinds of "MockResponse" given by the package:
 You can mock the FCM call as in the following example:
 
 ```php
-$numberSucess = 2;
-$mockResponse = new \LaravelFCM\Mocks\MockDownstreamResponse(numberSucess);
+$numberSuccess = 2;
+$mockResponse = new \LaravelFCM\Mocks\MockDownstreamResponse($numberSuccess);
 
 $mockResponse->addTokenToDelete('token_to_delete');
 $mockResponse->addTokenToModify('token_to_modify', 'token_modified');
@@ -472,7 +472,7 @@ $this->app->singleton('fcm.sender', function($app) use($sender) {
 
 ## API Documentation
 
-You can find more documentation about the API in the [API reference](./doc/Readme.md).
+You can find more documentation about the API in the [API reference](./doc/index.md).
 
 
 ## Licence

composer.json

@@ -15,13 +15,12 @@
         }
     ],
     "require": {
-        "php": ">=5.5.9",
+        "php": "^5.5.9 || ^7.0 || ^8.0",
         "illuminate/support": "5.* || ^6 || ^7 || ^8",
         "guzzlehttp/guzzle": "^6 || ^7",
         "monolog/monolog": "^1.12|^2.0"
     },
     "require-dev": {
-        "mockery/mockery" : "0.9.* || 1.4.*",
         "phpunit/phpunit" : "^4 || ^5 || ^6 || ^7 || ^8 || ^9",
         "laravel/laravel": "5.* || ^6 || ^7 || ^8"
     },