diff --git a/.travis.yml b/.travis.yml index 3d59880..c64608b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,10 @@ language: php php: - - 5.6 - - 7.0 - 7.1 - 7.2 + - 7.3 + - 7.4 before_script: - composer self-update diff --git a/LICENSE.md b/LICENSE.md index 15e287c..a243cc7 100644 --- a/LICENSE.md +++ b/LICENSE.md @@ -1,6 +1,6 @@ # MIT License -Copyright (c) 2016 solitweb.be +Copyright (c) 2016 syntaxevolution.com >Permission is hereby granted, free of charge, to any person obtaining a copy >of this software and associated documentation files (the "Software"), to deal @@ -18,4 +18,4 @@ Copyright (c) 2016 solitweb.be >AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER >LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, >OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE ->SOFTWARE. \ No newline at end of file +>SOFTWARE. diff --git a/README.md b/README.md index 6aae83f..766ac31 100644 --- a/README.md +++ b/README.md @@ -1,20 +1,20 @@ -# Laravel 5 DirectAdmin API wrapper -[![Latest Version](https://img.shields.io/github/release/solitweb/laravel-directadmin.svg?style=flat-square)](https://github.com/laravel-solitweb/directadmin/releases) +# Laravel 6 DirectAdmin API wrapper +[![Latest Version](https://img.shields.io/github/release/syntaxevolution/laravel-directadmin.svg?style=flat-square)](https://github.com/syntaxevolution/directadmin/releases) [![Software License](https://img.shields.io/badge/license-MIT-brightgreen.svg?style=flat-square)](LICENSE.md) -[![Build Status](https://img.shields.io/travis/solitweb/laravel-directadmin/master.svg?style=flat-square)](https://travis-ci.org/solitweb/laravel-directadmin) -[![Total Downloads](https://img.shields.io/packagist/dt/solitweb/laravel-directadmin.svg?style=flat-square)](https://packagist.org/packages/solitweb/laravel-directadmin) +[![Build Status](https://img.shields.io/travis/syntaxevolution/laravel-directadmin/master.svg?style=flat-square)](https://travis-ci.org/solitweb/laravel-directadmin) +[![Total Downloads](https://img.shields.io/packagist/dt/syntaxevolution/laravel-directadmin.svg?style=flat-square)](https://packagist.org/packages/syntaxevolution/laravel-directadmin) ## Installation You can install this package via Composer using: ```bash -composer require solitweb/laravel-directadmin +composer require syntaxevolution/laravel-directadmin ``` -Laravel 5.5 uses Package Auto-Discovery, so doesn't require you to manually add the ServiceProvider. +Laravel 6 uses Package Auto-Discovery, so doesn't require you to manually add the ServiceProvider. -## Laravel 5.5+: +## Laravel 6+: If you don't use auto-discovery, add the ServiceProvider to the providers array in config/app.php @@ -22,7 +22,7 @@ If you don't use auto-discovery, add the ServiceProvider to the providers array // config/app.php 'providers' => [ ... - Solitweb\LaravelDirectAdmin\LaravelDirectAdminServiceProvider::class, + SyntaxEvolution\LaravelDirectAdmin\LaravelDirectAdminServiceProvider::class, ]; ``` @@ -32,14 +32,14 @@ Optionally, register the facade: // config/app.php 'aliases' => [ ... - 'DirectAdmin' => Solitweb\LaravelDirectAdmin\LaravelDirectAdminFacade::class, + 'DirectAdmin' => SyntaxEvolution\LaravelDirectAdmin\LaravelDirectAdminFacade::class, ]; ``` To publish the config file to app/config/laravel-directadmin.php run: ```bash -php artisan vendor:publish --provider="Solitweb\LaravelDirectAdmin\LaravelDirectAdminServiceProvider" +php artisan vendor:publish --provider="SyntaxEvolution\LaravelDirectAdmin\LaravelDirectAdminServiceProvider" ``` ## Usage diff --git a/composer.json b/composer.json index 2536136..fb874bf 100644 --- a/composer.json +++ b/composer.json @@ -1,47 +1,47 @@ { - "name": "solitweb/laravel-directadmin", - "description": "Laravel 5 DirectAdmin API wrapper", + "name": "syntaxevolution/laravel-directadmin", + "description": "Laravel 6 DirectAdmin API wrapper", "keywords": [ - "solitweb", + "syntaxevolution", "laravel", "directadmin" ], - "homepage": "https://github.com/solitweb/laravel-directadmin", + "homepage": "https://github.com/syntaxevolution/laravel-directadmin", "license": "MIT", "authors": [ { - "name": "Stijn Vanouplines", - "email": "stijn@solitweb.be", - "homepage": "https://solitweb.be", + "name": "Topher L.", + "email": "topher@syntaxevolution.com", + "homepage": "https://www.syntaxevolution.com", "role": "Developer" } ], "require": { - "php": "~5.6|~7.0|~7.1|~7.2", - "illuminate/support": "~5.1.0|~5.2.0|~5.3.0|~5.4.0|~5.5.0|~5.6.0|~5.8.0|~6.4.0|~6.6.0", - "solitweb/directadmin": "^3.0.1" + "php": ">=7.4", + "illuminate/support": ">=7.0", + "solitweb/directadmin": ">=3.0.1" }, "require-dev": { - "phpunit/phpunit": "^4.8", - "mockery/mockery": "^0.9.4" + "phpunit/phpunit": ">=4.8", + "mockery/mockery": ">=0.9.4" }, "autoload": { "psr-4": { - "Solitweb\\LaravelDirectAdmin\\": "src/" + "SyntaxEvolution\\LaravelDirectAdmin\\": "src/" } }, "autoload-dev": { "psr-4": { - "Solitweb\\LaravelDirectAdmin\\Test\\": "tests" + "SyntaxEvolution\\LaravelDirectAdmin\\Test\\": "tests" } }, "extra": { "laravel": { "providers": [ - "Solitweb\\LaravelDirectAdmin\\LaravelDirectAdminServiceProvider" + "SyntaxEvolution\\LaravelDirectAdmin\\LaravelDirectAdminServiceProvider" ], "aliases": { - "DirectAdmin": "Solitweb\\LaravelDirectAdmin\\LaravelDirectAdminFacade" + "DirectAdmin": "SyntaxEvolution\\LaravelDirectAdmin\\LaravelDirectAdminFacade" } } } diff --git a/src/LaravelDirectAdmin.php b/src/LaravelDirectAdmin.php index c43bf36..6e2a59f 100644 --- a/src/LaravelDirectAdmin.php +++ b/src/LaravelDirectAdmin.php @@ -1,6 +1,6 @@ connection->set_method(strtoupper($method)); - return $this->request( - $this->camelToSnake($command), - $arguments - ); + if($command == "SSL"){ + return $this->request( + "SSL", + $arguments + ); + }else{ + return $this->request( + $this->camelToSnake($command), + $arguments + ); + } } /** diff --git a/src/LaravelDirectAdminFacade.php b/src/LaravelDirectAdminFacade.php index bedf7aa..309fd1b 100644 --- a/src/LaravelDirectAdminFacade.php +++ b/src/LaravelDirectAdminFacade.php @@ -1,6 +1,6 @@