Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-11-04 08:07:34 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4247 from turbo124/v5-develop

Browse Source 
Update composer
This commit is contained in:
David Bomba 2020-11-02 08:50:25 +11:00 committed by GitHub
commit 29a1ccefb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 91 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Middleware/ApiSecretCheck.php
View File

@ -27,6 +27,10 @@ class ApiSecretCheck
*/ */
public function handle($request, Closure $next) public function handle($request, Closure $next)
{ {
if(! config('ninja.api_secret'))
return $next($request);
if ($request->header('X-API-SECRET') && ($request->header('X-API-SECRET') == config('ninja.api_secret'))) { if ($request->header('X-API-SECRET') && ($request->header('X-API-SECRET') == config('ninja.api_secret'))) {
return $next($request); return $next($request);
} else { } else {

2
composer.json
View File

@ -30,7 +30,7 @@
"authorizenet/authorizenet": "^2.0", "authorizenet/authorizenet": "^2.0",
"checkout/checkout-sdk-php": "^1.0", "checkout/checkout-sdk-php": "^1.0",
"cleverit/ubl_invoice": "^1.3", "cleverit/ubl_invoice": "^1.3",
"composer/composer": "^1.10", "composer/composer": "^2",
"czproject/git-php": "^3.17", "czproject/git-php": "^3.17",
"doctrine/dbal": "^2.10", "doctrine/dbal": "^2.10",
"fedeisas/laravel-mail-css-inliner": "^3", "fedeisas/laravel-mail-css-inliner": "^3",

120
composer.lock generated
View File

@ -4,7 +4,7 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "5055049d1f5fa8418925b54a94265526", "content-hash": "7e448a70f9bd66e655c3a9dab1159d66",
"packages": [ "packages": [
{ {
"name": "asgrim/ofxparser", "name": "asgrim/ofxparser",
@ -521,39 +521,37 @@
}, },
{ {
"name": "composer/composer", "name": "composer/composer",
"version": "1.10.17", "version": "2.0.4",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/composer.git", "url": "https://github.com/composer/composer.git",
"reference": "09d42e18394d8594be24e37923031c4b7442a1cb" "reference": "4053eab90a7cdf0b81dd93073dc6c18c15d487fd"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/composer/zipball/09d42e18394d8594be24e37923031c4b7442a1cb", "url": "https://api.github.com/repos/composer/composer/zipball/4053eab90a7cdf0b81dd93073dc6c18c15d487fd",
"reference": "09d42e18394d8594be24e37923031c4b7442a1cb", "reference": "4053eab90a7cdf0b81dd93073dc6c18c15d487fd",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"composer/ca-bundle": "^1.0", "composer/ca-bundle": "^1.0",
"composer/semver": "^1.0", "composer/semver": "^3.0",
"composer/spdx-licenses": "^1.2", "composer/spdx-licenses": "^1.2",
"composer/xdebug-handler": "^1.1", "composer/xdebug-handler": "^1.1",
"justinrainbow/json-schema": "^5.2.10", "justinrainbow/json-schema": "^5.2.10",
"php": "^5.3.2 || ^7.0", "php": "^5.3.2 || ^7.0 || ^8.0",
"psr/log": "^1.0", "psr/log": "^1.0",
"react/promise": "^1.2 || ^2.7",
"seld/jsonlint": "^1.4", "seld/jsonlint": "^1.4",
"seld/phar-utils": "^1.0", "seld/phar-utils": "^1.0",
"symfony/console": "^2.7 || ^3.0 || ^4.0 || ^5.0", "symfony/console": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
"symfony/filesystem": "^2.7 || ^3.0 || ^4.0 || ^5.0", "symfony/filesystem": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
"symfony/finder": "^2.7 || ^3.0 || ^4.0 || ^5.0", "symfony/finder": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0",
"symfony/process": "^2.7 || ^3.0 || ^4.0 || ^5.0" "symfony/process": "^2.8.52 || ^3.4.35 || ^4.4 || ^5.0"
},
"conflict": {
"symfony/console": "2.8.38"
}, },
"require-dev": { "require-dev": {
"phpspec/prophecy": "^1.10", "phpspec/prophecy": "^1.10",
"symfony/phpunit-bridge": "^4.2" "symfony/phpunit-bridge": "^4.2 || ^5.0"
}, },
"suggest": { "suggest": {
"ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages", "ext-openssl": "Enabling the openssl extension allows you to access https URLs for repositories and packages",
@ -566,7 +564,7 @@
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.10-dev" "dev-master": "2.0-dev"
} }
}, },
"autoload": { "autoload": {
@ -582,12 +580,12 @@
{ {
"name": "Nils Adermann", "name": "Nils Adermann",
"email": "naderman@naderman.de", "email": "naderman@naderman.de",
"homepage": "http://www.naderman.de" "homepage": "https://www.naderman.de"
}, },
{ {
"name": "Jordi Boggiano", "name": "Jordi Boggiano",
"email": "j.boggiano@seld.be", "email": "j.boggiano@seld.be",
"homepage": "http://seld.be" "homepage": "https://seld.be"
} }
], ],
"description": "Composer helps you declare, manage and install dependencies of PHP projects. It ensures you have the right stack everywhere.", "description": "Composer helps you declare, manage and install dependencies of PHP projects. It ensures you have the right stack everywhere.",
@ -600,7 +598,7 @@
"support": { "support": {
"irc": "irc://irc.freenode.org/composer", "irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/composer/issues", "issues": "https://github.com/composer/composer/issues",
"source": "https://github.com/composer/composer/tree/1.10.17" "source": "https://github.com/composer/composer/tree/2.0.4"
}, },
"funding": [ "funding": [
{ {
@ -616,7 +614,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-10-30T21:31:58+00:00" "time": "2020-10-30T21:39:11+00:00"
}, },
{ {
"name": "composer/package-versions-deprecated", "name": "composer/package-versions-deprecated",
@ -693,28 +691,29 @@
}, },
{ {
"name": "composer/semver", "name": "composer/semver",
"version": "1.7.1", "version": "3.2.2",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/composer/semver.git", "url": "https://github.com/composer/semver.git",
"reference": "38276325bd896f90dfcfe30029aa5db40df387a7" "reference": "4089fddb67bcf6bf860d91b979e95be303835002"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/composer/semver/zipball/38276325bd896f90dfcfe30029aa5db40df387a7", "url": "https://api.github.com/repos/composer/semver/zipball/4089fddb67bcf6bf860d91b979e95be303835002",
"reference": "38276325bd896f90dfcfe30029aa5db40df387a7", "reference": "4089fddb67bcf6bf860d91b979e95be303835002",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
"php": "^5.3.2 || ^7.0" "php": "^5.3.2 || ^7.0 || ^8.0"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^4.5 || ^5.0.5" "phpstan/phpstan": "^0.12.19",
"symfony/phpunit-bridge": "^4.2 || ^5"
}, },
"type": "library", "type": "library",
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"dev-master": "1.x-dev" "dev-main": "3.x-dev"
} }
}, },
"autoload": { "autoload": {
@ -753,7 +752,7 @@
"support": { "support": {
"irc": "irc://irc.freenode.org/composer", "irc": "irc://irc.freenode.org/composer",
"issues": "https://github.com/composer/semver/issues", "issues": "https://github.com/composer/semver/issues",
"source": "https://github.com/composer/semver/tree/1.7.1" "source": "https://github.com/composer/semver/tree/3.2.2"
}, },
"funding": [ "funding": [
{ {
@ -769,7 +768,7 @@
"type": "tidelift" "type": "tidelift"
} }
], ],
"time": "2020-09-27T13:13:07+00:00" "time": "2020-10-14T08:51:15+00:00"
}, },
{ {
"name": "composer/spdx-licenses", "name": "composer/spdx-licenses",
@ -1820,6 +1819,7 @@
"issues": "https://github.com/fzaninotto/Faker/issues", "issues": "https://github.com/fzaninotto/Faker/issues",
"source": "https://github.com/fzaninotto/Faker/tree/v1.9.1" "source": "https://github.com/fzaninotto/Faker/tree/v1.9.1"
}, },
"abandoned": true,
"time": "2019-12-12T13:22:17+00:00" "time": "2019-12-12T13:22:17+00:00"
}, },
{ {
@ -5975,6 +5975,56 @@
], ],
"time": "2020-08-18T17:17:46+00:00" "time": "2020-08-18T17:17:46+00:00"
}, },
{
"name": "react/promise",
"version": "v2.8.0",
"source": {
"type": "git",
"url": "https://github.com/reactphp/promise.git",
"reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/reactphp/promise/zipball/f3cff96a19736714524ca0dd1d4130de73dbbbc4",
"reference": "f3cff96a19736714524ca0dd1d4130de73dbbbc4",
"shasum": ""
},
"require": {
"php": ">=5.4.0"
},
"require-dev": {
"phpunit/phpunit": "^7.0 || ^6.5 || ^5.7 || ^4.8.36"
},
"type": "library",
"autoload": {
"psr-4": {
"React\\Promise\\": "src/"
},
"files": [
"src/functions_include.php"
]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
"MIT"
],
"authors": [
{
"name": "Jan Sorgalla",
"email": "jsorgalla@gmail.com"
}
],
"description": "A lightweight implementation of CommonJS Promises/A for PHP",
"keywords": [
"promise",
"promises"
],
"support": {
"issues": "https://github.com/reactphp/promise/issues",
"source": "https://github.com/reactphp/promise/tree/v2.8.0"
},
"time": "2020-05-12T15:16:56+00:00"
},
{ {
"name": "sabre/uri", "name": "sabre/uri",
"version": "2.2.1", "version": "2.2.1",
@ -10684,16 +10734,16 @@
}, },
{ {
"name": "filp/whoops", "name": "filp/whoops",
"version": "2.9.0", "version": "2.9.1",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/filp/whoops.git", "url": "https://github.com/filp/whoops.git",
"reference": "2ec31f3adc54c71a59c5e3c2143d7a0e2f8899f8" "reference": "307fb34a5ab697461ec4c9db865b20ff2fd40771"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/filp/whoops/zipball/2ec31f3adc54c71a59c5e3c2143d7a0e2f8899f8", "url": "https://api.github.com/repos/filp/whoops/zipball/307fb34a5ab697461ec4c9db865b20ff2fd40771",
"reference": "2ec31f3adc54c71a59c5e3c2143d7a0e2f8899f8", "reference": "307fb34a5ab697461ec4c9db865b20ff2fd40771",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -10743,9 +10793,9 @@
], ],
"support": { "support": {
"issues": "https://github.com/filp/whoops/issues", "issues": "https://github.com/filp/whoops/issues",
"source": "https://github.com/filp/whoops/tree/2.9.0" "source": "https://github.com/filp/whoops/tree/2.9.1"
}, },
"time": "2020-10-20T12:00:00+00:00" "time": "2020-11-01T12:00:00+00:00"
}, },
{ {
"name": "hamcrest/hamcrest-php", "name": "hamcrest/hamcrest-php",

2
config/ninja.php
View File

@ -15,7 +15,7 @@ return [
'app_version' => '5.0.23', 'app_version' => '5.0.23',
'minimum_client_version' => '5.0.16', 'minimum_client_version' => '5.0.16',
'terms_version' => '1.0.1', 'terms_version' => '1.0.1',
'api_secret' => env('API_SECRET', ''), 'api_secret' => env('API_SECRET', false),
'google_maps_api_key' => env('GOOGLE_MAPS_API_KEY'), 'google_maps_api_key' => env('GOOGLE_MAPS_API_KEY'),
'google_analytics_url' => env('GOOGLE_ANALYTICS_URL', 'https://www.google-analytics.com/collect'), 'google_analytics_url' => env('GOOGLE_ANALYTICS_URL', 'https://www.google-analytics.com/collect'),
'key_length' => 64, 'key_length' => 64,