File tree Expand file tree Collapse file tree 6 files changed +20
-5
lines changed Expand file tree Collapse file tree 6 files changed +20
-5
lines changed Original file line number Diff line number Diff line change @@ -4,4 +4,5 @@ composer.lock
44/build
55/.idea
66/.vscode
7- .phpunit.result.cache
7+ .phpunit.result.cache
8+ .php_cs.cache
Original file line number Diff line number Diff line change 1- preset : laravel
1+ preset : laravel
2+
3+ enabled :
4+ - length_ordered_imports
5+
6+ disabled :
7+ - alpha_ordered_imports
Original file line number Diff line number Diff line change @@ -15,6 +15,10 @@ matrix:
1515 env : LARAVEL='5.8.*' COMPOSER_FLAGS='--prefer-lowest'
1616 - php : 7.3
1717 env : LARAVEL='5.8.*' COMPOSER_FLAGS='--prefer-stable'
18+ - php : 7.4
19+ env : LARAVEL='5.8.*' COMPOSER_FLAGS='--prefer-lowest'
20+ - php : 7.4
21+ env : LARAVEL='5.8.*' COMPOSER_FLAGS='--prefer-stable'
1822 - php : 7.2
1923 env : LARAVEL='6.*' COMPOSER_FLAGS='--prefer-lowest'
2024 - php : 7.2
@@ -23,6 +27,10 @@ matrix:
2327 env : LARAVEL='6.*' COMPOSER_FLAGS='--prefer-lowest'
2428 - php : 7.3
2529 env : LARAVEL='6.*' COMPOSER_FLAGS='--prefer-stable'
30+ - php : 7.4
31+ env : LARAVEL='6.*' COMPOSER_FLAGS='--prefer-lowest'
32+ - php : 7.4
33+ env : LARAVEL='6.*' COMPOSER_FLAGS='--prefer-stable'
2634
2735before_install :
2836 - travis_retry composer self-update
Original file line number Diff line number Diff line change 1616 "require" : {
1717 "php" : " ^7.2" ,
1818 "illuminate/support" : " ~5.8.0|^6.0" ,
19- "google/apiclient" : " ^2.2 "
19+ "google/apiclient" : " ^2.4 "
2020 },
2121 "require-dev" : {
2222 "phpunit/phpunit" : " ^8.3" ,
File renamed without changes.
Original file line number Diff line number Diff line change @@ -13,7 +13,7 @@ public function boot()
1313 {
1414 if (function_exists ('config_path ' )) {
1515 $ this ->publishes ([
16- __DIR__ .'/config /config.php ' => config_path ('google.php ' ),
16+ __DIR__ .'/.. /config/google .php ' => config_path ('google.php ' ),
1717 ], 'config ' );
1818 }
1919 }
@@ -25,7 +25,7 @@ public function boot()
2525 */
2626 public function register ()
2727 {
28- $ this ->mergeConfigFrom (__DIR__ .'/config /config.php ' , 'google ' );
28+ $ this ->mergeConfigFrom (__DIR__ .'/.. /config/google .php ' , 'google ' );
2929
3030 $ this ->app ->bind ('PulkitJalan\Google\Client ' , function ($ app ) {
3131 return new Client ($ app ['config ' ]['google ' ]);
You can’t perform that action at this time.
0 commit comments