diff --git a/VERSION.txt b/VERSION.txt index 3b55d969e6..01bc998166 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.1.38 \ No newline at end of file +5.1.39 \ No newline at end of file diff --git a/composer.json b/composer.json index bcf189fe9c..d13ec2f058 100644 --- a/composer.json +++ b/composer.json @@ -41,7 +41,7 @@ "turbo124/laravel-gmail": "^5", "doctrine/dbal": "^2.10", "fideloper/proxy": "^4.2", - "fzaninotto/faker": "^1.4", + "fakerphp/faker": "^1.9.1", "google/apiclient": "^2.7", "guzzlehttp/guzzle": "^7.0.1", "hashids/hashids": "^4.0", diff --git a/composer.lock b/composer.lock index ebd50635ef..64b02c023e 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "feb70f976b798dde6550a7b5439bb191", + "content-hash": "4abefd659932cc08bc942db44a78d06e", "packages": [ { "name": "authorizenet/authorizenet", @@ -1737,6 +1737,63 @@ ], "time": "2020-12-29T14:50:06+00:00" }, + { + "name": "fakerphp/faker", + "version": "v1.9.2", + "source": { + "type": "git", + "url": "https://github.com/FakerPHP/Faker.git", + "reference": "84220cf137a9344acffb10374e781fed785ff307" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/FakerPHP/Faker/zipball/84220cf137a9344acffb10374e781fed785ff307", + "reference": "84220cf137a9344acffb10374e781fed785ff307", + "shasum": "" + }, + "require": { + "php": "^5.3.3 || ^7.0" + }, + "conflict": { + "ergebnis/faker": "!=1.9.2", + "fzaninotto/faker": "!=1.9.2" + }, + "replace": { + "ergebnis/faker": "1.9.2", + "fzaninotto/faker": "1.9.2" + }, + "require-dev": { + "ext-intl": "*", + "phpunit/phpunit": "^4.8.35 || ^5.7", + "squizlabs/php_codesniffer": "^2.9.2" + }, + "type": "library", + "autoload": { + "psr-4": { + "Faker\\": "src/Faker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "François Zaninotto" + } + ], + "description": "Faker is a PHP library that generates fake data for you.", + "keywords": [ + "data", + "faker", + "fixtures" + ], + "support": { + "issues": "https://github.com/FakerPHP/Faker/issues", + "source": "https://github.com/FakerPHP/Faker/tree/v1.9.2" + }, + "time": "2020-12-11T14:32:13+00:00" + }, { "name": "fideloper/proxy", "version": "4.4.1", @@ -1849,61 +1906,6 @@ }, "time": "2021-02-12T00:02:00+00:00" }, - { - "name": "fzaninotto/faker", - "version": "v1.9.2", - "source": { - "type": "git", - "url": "https://github.com/fzaninotto/Faker.git", - "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/848d8125239d7dbf8ab25cb7f054f1a630e68c2e", - "reference": "848d8125239d7dbf8ab25cb7f054f1a630e68c2e", - "shasum": "" - }, - "require": { - "php": "^5.3.3 || ^7.0" - }, - "require-dev": { - "ext-intl": "*", - "phpunit/phpunit": "^4.8.35 || ^5.7", - "squizlabs/php_codesniffer": "^2.9.2" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "1.9-dev" - } - }, - "autoload": { - "psr-4": { - "Faker\\": "src/Faker/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "François Zaninotto" - } - ], - "description": "Faker is a PHP library that generates fake data for you.", - "keywords": [ - "data", - "faker", - "fixtures" - ], - "support": { - "issues": "https://github.com/fzaninotto/Faker/issues", - "source": "https://github.com/fzaninotto/Faker/tree/v1.9.2" - }, - "abandoned": true, - "time": "2020-12-11T09:56:16+00:00" - }, { "name": "google/apiclient", "version": "v2.9.1", diff --git a/config/ninja.php b/config/ninja.php index 0f1e6d9968..4ebb877383 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -14,7 +14,7 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/'), 'app_domain' => env('APP_DOMAIN', ''), - 'app_version' => '5.1.38', + 'app_version' => '5.1.39', 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', false),