From 430e31c1ad8b763432da84ffa28cb6d1ebf2d6a2 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 5 May 2021 08:28:55 +1000 Subject: [PATCH] Minor fixes for self updater --- app/Http/Controllers/SelfUpdateController.php | 2 +- composer.json | 1 + composer.lock | 55 ++++++++++++++++++- 3 files changed, 56 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/SelfUpdateController.php b/app/Http/Controllers/SelfUpdateController.php index cb3bcb1eff..4955cda39b 100644 --- a/app/Http/Controllers/SelfUpdateController.php +++ b/app/Http/Controllers/SelfUpdateController.php @@ -58,7 +58,7 @@ class SelfUpdateController extends BaseController set_time_limit(0); define('STDIN', fopen('php://stdin', 'r')); - if (Ninja::isNinja()) { + if (Ninja::isHosted()) { return response()->json(['message' => ctrans('texts.self_update_not_available')], 403); } diff --git a/composer.json b/composer.json index 9c0e61428f..569fda9800 100644 --- a/composer.json +++ b/composer.json @@ -30,6 +30,7 @@ "ext-dom": "*", "ext-json": "*", "ext-libxml": "*", + "asm/php-ansible": "dev-master", "authorizenet/authorizenet": "^2.0", "bacon/bacon-qr-code": "^2.0", "beganovich/snappdf": "^1.0", diff --git a/composer.lock b/composer.lock index 8dad042434..0753e3b846 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,60 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "f01381d3d00f0bd84acbda078ad1b99e", + "content-hash": "38a79899673526624db4d62a76dd9a5e", "packages": [ + { + "name": "asm/php-ansible", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/maschmann/php-ansible.git", + "reference": "4f2145cad264fd9f800baf6d3a79dd43fd8009db" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/maschmann/php-ansible/zipball/4f2145cad264fd9f800baf6d3a79dd43fd8009db", + "reference": "4f2145cad264fd9f800baf6d3a79dd43fd8009db", + "shasum": "" + }, + "require": { + "php": "^7.1.0|>8.0.0", + "psr/log": "^1.1", + "symfony/process": "^4.0|^5.0" + }, + "require-dev": { + "mikey179/vfsstream": "^1.6", + "phpunit/phpunit": "^9.0" + }, + "default-branch": true, + "type": "library", + "autoload": { + "psr-4": { + "Asm\\": "Asm" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marc Aschmann", + "email": "maschmann@gmail.com" + } + ], + "description": "A PHP wrapper for Ansible.", + "homepage": "https://github.com/maschmann/php-ansible", + "keywords": [ + "ansible", + "php" + ], + "support": { + "issues": "https://github.com/maschmann/php-ansible/issues", + "source": "https://github.com/maschmann/php-ansible/tree/master" + }, + "time": "2021-03-02T18:27:29+00:00" + }, { "name": "authorizenet/authorizenet", "version": "2.0.2", @@ -14247,6 +14299,7 @@ "aliases": [], "minimum-stability": "dev", "stability-flags": { + "asm/php-ansible": 20, "webpatser/laravel-countries": 20 }, "prefer-stable": true,