Compare commits
No commits in common. "45ea239d7ccab0e958857698afbaa21bbeff308a" and "65ac999075f56f90a57b27cdc992ff7e72e6ea2a" have entirely different histories.
45ea239d7c
...
65ac999075
@ -11,12 +11,4 @@ pipeline:
|
|||||||
image: composer
|
image: composer
|
||||||
commands:
|
commands:
|
||||||
- composer install
|
- composer install
|
||||||
- ./vendor/bin/phpunit tests
|
- ./vendor/bin/phpunit tests
|
||||||
analyze:
|
|
||||||
image: php
|
|
||||||
commands:
|
|
||||||
- ./vendor/bin/phpmd src text cleancode,codesize,controversial,design,naming,unusedcode
|
|
||||||
- ./vendor/bin/phpstan analyze --level=7 src/ backup
|
|
||||||
- ./vendor/bin/psalm
|
|
||||||
- ./vendor/bin/phpcs src
|
|
||||||
failure: ignore
|
|
2
Makefile
2
Makefile
@ -5,8 +5,6 @@ analyze-all:
|
|||||||
-./vendor/bin/phpstan analyze --level=7 src/ backup
|
-./vendor/bin/phpstan analyze --level=7 src/ backup
|
||||||
@echo Psalm
|
@echo Psalm
|
||||||
-./vendor/bin/psalm
|
-./vendor/bin/psalm
|
||||||
@echo PHP_CodeSniffer
|
|
||||||
-./vendor/bin/phpcs src
|
|
||||||
install:
|
install:
|
||||||
php composer.phar install --no-dev
|
php composer.phar install --no-dev
|
||||||
install-dev:
|
install-dev:
|
||||||
|
@ -8,8 +8,7 @@ use Monolog\Logger;
|
|||||||
use Monolog\Handler\StreamHandler;
|
use Monolog\Handler\StreamHandler;
|
||||||
use Psr\Log\NullLogger;
|
use Psr\Log\NullLogger;
|
||||||
|
|
||||||
class App
|
class App {
|
||||||
{
|
|
||||||
protected Logger $logger;
|
protected Logger $logger;
|
||||||
protected array $config;
|
protected array $config;
|
||||||
|
|
||||||
@ -17,7 +16,7 @@ class App
|
|||||||
{
|
{
|
||||||
$this->config = Yaml::parseFile($configFile);
|
$this->config = Yaml::parseFile($configFile);
|
||||||
$logger = new Logger('app');
|
$logger = new Logger('app');
|
||||||
if (isset($this->config['log'])) {
|
if(isset($this->config['log'])) {
|
||||||
$logger->pushHandler(new StreamHandler($this->getConfig()['log']));
|
$logger->pushHandler(new StreamHandler($this->getConfig()['log']));
|
||||||
}
|
}
|
||||||
$logger->info("Initialization complete");
|
$logger->info("Initialization complete");
|
||||||
|
@ -41,7 +41,7 @@ class CommandBackup extends Command
|
|||||||
$rclone->setLogger($app->getLogger()->withName('rclone'));
|
$rclone->setLogger($app->getLogger()->withName('rclone'));
|
||||||
|
|
||||||
$ntfy = new Ntfy\Ntfy($app->getConfig()['notification']['domain']);
|
$ntfy = new Ntfy\Ntfy($app->getConfig()['notification']['domain']);
|
||||||
$ntfy->setLogger($app->getLogger()->withName('notification'));
|
$ntfy->setLogger( $app->getLogger()->withName('notification'));
|
||||||
|
|
||||||
$loader = new ArrayLoader($app->getConfig()['templates']);
|
$loader = new ArrayLoader($app->getConfig()['templates']);
|
||||||
$twig = new Environment($loader);
|
$twig = new Environment($loader);
|
||||||
|
@ -10,7 +10,7 @@ use Symfony\Component\Process\Exception\ProcessFailedException;
|
|||||||
|
|
||||||
use Exception;
|
use Exception;
|
||||||
|
|
||||||
class Rclone
|
class Rclone
|
||||||
{
|
{
|
||||||
use LoggerAwareTrait;
|
use LoggerAwareTrait;
|
||||||
|
|
||||||
@ -70,12 +70,8 @@ class Rclone
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Execute a command on the rclone binary
|
* @param $command Top level Rclone command
|
||||||
*
|
* @param array<String> $options
|
||||||
* @param string $command Top level Rclone command
|
|
||||||
* @param array<String> $options Array of additional options
|
|
||||||
*
|
|
||||||
* @return string stdout data.
|
|
||||||
*/
|
*/
|
||||||
protected function exec(string $command, array $options = array()) : string
|
protected function exec(string $command, array $options = array()) : string
|
||||||
{
|
{
|
||||||
|
@ -17,10 +17,8 @@ class AppExtension extends AbstractExtension
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* Format a file size to be human readable
|
* Format a file size to be human readable
|
||||||
*
|
|
||||||
* @param int $bytes Number of bytes
|
* @param int $bytes Number of bytes
|
||||||
* @param int $precision Precision
|
* @param int $precision Precision
|
||||||
*
|
|
||||||
* @return string Formatted string
|
* @return string Formatted string
|
||||||
*/
|
*/
|
||||||
public function formatBytes($bytes, $precision = 2)
|
public function formatBytes($bytes, $precision = 2)
|
||||||
|
Loading…
Reference in New Issue
Block a user