Skip to content

Commit ffa8957

Browse files
Merge 'main' into 6.0
2 parents 6dd994b + 9a03d8e commit ffa8957

335 files changed

Lines changed: 711 additions & 1342 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/workflows/integration.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
strategy:
1313
matrix:
1414
os: [ubuntu-latest]
15-
php: ['8.0', '8.1', '8.2', '8.3', '8.4']
15+
php: ['8.1', '8.2', '8.3', '8.4']
1616
steps:
1717
- uses: actions/checkout@master
1818

@@ -27,7 +27,7 @@ jobs:
2727
run: php -v
2828

2929
- name : Install tooling
30-
run : GITHUB_AUTH_TOKEN=${{ secrets.GITHUB_TOKEN }} phive --no-progress --home ./.phive install --force-accept-unsigned --trust-gpg-keys 661E97400F658E25,5E6DDE998AB73B8E,51C67305FFC2E5C0,4AA394086372C20A,31C7E470E2138192,8E730BA25823D8B5,CF1A108D0E7AE720,2DF45277AEF09A2F,2A8299CE842DD38C,A978220305CD5C32
30+
run : GITHUB_AUTH_TOKEN=${{ secrets.GITHUB_TOKEN }} phive --no-progress --home ./.phive install --force-accept-unsigned --trust-gpg-keys 97B02DD8E5071466,661E97400F658E25,5E6DDE998AB73B8E,51C67305FFC2E5C0,4AA394086372C20A,31C7E470E2138192,8E730BA25823D8B5,CF1A108D0E7AE720,2DF45277AEF09A2F,2A8299CE842DD38C,A978220305CD5C32
3131

3232
- name: Update composer
3333
run: composer self-update
@@ -36,7 +36,7 @@ jobs:
3636
run: composer validate
3737

3838
- name: Install dependencies
39-
run: composer install --prefer-dist --no-progress --no-suggest ${{ matrix.composeroptions }}
39+
run: composer install --prefer-dist ${{ matrix.composeroptions }}
4040

4141
- name: Execute unit tests
4242
run: tools/phpunit --configuration=phpunit.xml

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
*PHPBU* is a php tool that creates and encrypts backups, syncs your backups to other servers or cloud services
66
and assists you monitor your backup creation.
77

8-
Get an in depth look into all the features and a short 'getting started' tutorial at the [PHPBU Website](https://phpbu.de).
8+
Get an in depth look into all the features and a short 'getting started' tutorial at the [PHPBU Website](https://www.phpbu.de).
99

1010
[![Latest Stable Version](https://poser.pugx.org/phpbu/phpbu/v/stable.svg)](https://packagist.org/packages/phpbu/phpbu)
1111
[![Minimum PHP Version](https://img.shields.io/badge/php-%3E%3D%208.0-8892BF.svg)](https://php.net/)
@@ -14,8 +14,9 @@ Get an in depth look into all the features and a short 'getting started' tutoria
1414
[![Build Status](https://github.com/sebastianfeldmann/phpbu/workflows/Integration/badge.svg)](https://github.com/sebastianfeldmann/phpbu/actions)
1515
[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/sebastianfeldmann/phpbu/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/sebastianfeldmann/phpbu/?branch=master)
1616
[![Code Coverage](https://scrutinizer-ci.com/g/sebastianfeldmann/phpbu/badges/coverage.png?b=master)](https://scrutinizer-ci.com/g/sebastianfeldmann/phpbu/?branch=master)
17-
[![PHP Website](https://img.shields.io/website-up-down-green-red/https/phpbu.de.svg)](https://phpbu.de)
17+
[![PHP Website](https://img.shields.io/website-up-down-green-red/https/phpbu.de.svg)](https://www.phpbu.de)
1818

19+
If you are not using php 8.1 or greater already you can still use phpbu version [6.0.30](https://phar.phpbu.de/phpbu-6.0.20.phar) \
1920
If you are not using php 8.0 or greater already you can still use phpbu version [6.0.20](https://phar.phpbu.de/phpbu-6.0.20.phar) \
2021
If you are not using php 7.2 or greater already you can still use phpbu version [5.2.10](https://phar.phpbu.de/phpbu-5.2.10.phar) \
2122
If you are behind php 7.0 you can still use phpbu version [4.0.10](https://phar.phpbu.de/phpbu-4.0.10.phar)
@@ -55,7 +56,6 @@ If you are behind php 7.0 you can still use phpbu version [4.0.10](https://phar.
5556
+ rsync
5657
+ SFTP
5758
+ Softlayer
58-
+ Yandex Disk
5959
* Cleanup your local backup
6060
+ Delete backups older x
6161
+ Store only x MB of backups
@@ -151,7 +151,7 @@ Simple configuration example in XML:
151151
```xml
152152
<?xml version="1.0" encoding="UTF-8"?>
153153
<phpbu xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
154-
xsi:noNamespaceSchemaLocation="http://schema.phpbu.de/6.0/phpbu.xsd"
154+
xsi:noNamespaceSchemaLocation="https://www.phpbu.de/schema/6.0/phpbu.xsd"
155155
verbose="true">
156156
<backups>
157157
<backup name="myAppDB">

composer.json

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
}
4545
},
4646
"require": {
47-
"php": ">=8.0",
47+
"php": ">=8.1",
4848
"ext-dom": "*",
4949
"ext-json": "*",
5050
"ext-spl": "*",
@@ -63,7 +63,6 @@
6363
"vlucas/phpdotenv": "^4.0",
6464
"google/apiclient":"^2.7",
6565
"php-opencloud/openstack": "^3.0",
66-
"arhitector/yandex": "^2.0",
6766
"microsoft/azure-storage-blob": "^1.4",
6867
"phpmailer/phpmailer": "^6.0",
6968
"google/cloud-storage": "^1.42"
@@ -78,7 +77,6 @@
7877
"php-opencloud/openstack": "Require ^3.0 to sync to OpenStack",
7978
"vlucas/phpdotenv": "Require ^3.0 or ^4.0 or ^5.0 to use the Dotenv adapter",
8079
"google/apiclient":"Require ^2.0 to sync to Google Drive",
81-
"arhitector/yandex":"Require ^2.0 to sync to Yandex Disk",
8280
"microsoft/azure-storage-blob": "Require ^1.4 to sync to Azure Blob Storage",
8381
"phpmailer/phpmailer": "Require ^6.0 to receive logs via email",
8482
"google/cloud-storage": "Require ^1.42 to sync to Google Cloud Storage"
@@ -95,7 +93,7 @@
9593
"post-autoload-dump": "tools/captainhook install -f -s",
9694
"setup": "phive install",
9795
"test": "tools/phpunit",
98-
"analyse": "tools/phpstan analyse",
96+
"static": "tools/phpstan analyse",
9997
"style": "tools/phpcs --standard=psr2 src"
10098
},
10199
"config": {

phive.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phive xmlns="https://phar.io/phive">
3-
<phar name="captainhook" version="^5.10" location="./tools/captainhook" copy="true" installed="5.24.1"/>
4-
<phar name="phpunit" version="^9.4.3" location="./tools/phpunit" copy="true" installed="9.6.21"/>
5-
<phar name="phpab" version="^1.20.0" location="./tools/phpab" copy="true" installed="1.29.2"/>
6-
<phar name="phpcs" version="^3.5.2" location="./tools/phpcs" copy="true" installed="3.11.1"/>
7-
<phar name="phpstan" version="^1.0" location="./tools/phpstan" copy="true" installed="1.12.11"/>
3+
<phar name="captainhook" version="^5.10" location="./tools/captainhook" copy="true" installed="5.27.5"/>
4+
<phar name="phpunit" version="^9.4.3" location="./tools/phpunit" copy="true" installed="9.6.34"/>
5+
<phar name="phpab" version="^1.20.0" location="./tools/phpab" copy="true" installed="1.29.4"/>
6+
<phar name="phpcs" version="^3.5.2" location="./tools/phpcs" copy="true" installed="3.13.5"/>
7+
<phar name="phpstan" version="^1.0" location="./tools/phpstan" copy="true" installed="1.12.32"/>
88
</phive>

phpbu.xml.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<phpbu xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
3-
xsi:noNamespaceSchemaLocation="http://schema.phpbu.de/6.0/phpbu.xsd"
3+
xsi:noNamespaceSchemaLocation="https://www.phpbu.de/schema/6.0/phpbu.xsd"
44
verbose="true">
55

66
<logging>

phpbu.xsd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
22
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
33
<xs:annotation>
4-
<xs:documentation source="http://www.phpbu.de/">
4+
<xs:documentation source="https://www.phpbu.de/">
55
This schema file defines the rules by which the XML configuration file of phpbu 6.0 may be structured.
66
</xs:documentation>
77
</xs:annotation>

src/Adapter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* @author Sebastian Feldmann <sebastian@phpbu.de>
1010
* @copyright Sebastian Feldmann <sebastian@phpbu.de>
1111
* @license https://opensource.org/licenses/MIT The MIT License (MIT)
12-
* @link http://phpbu.de/
12+
* @link https://phpbu.de/
1313
* @since Class available since Release 4.0.0
1414
*/
1515
interface Adapter

src/Adapter/Dotenv.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @author Sebastian Feldmann <sebastian@phpbu.de>
1515
* @copyright Sebastian Feldmann <sebastian@phpbu.de>
1616
* @license https://opensource.org/licenses/MIT The MIT License (MIT)
17-
* @link http://phpbu.de/
17+
* @link https://phpbu.de/
1818
* @since Class available since Release 4.0.0
1919
*/
2020
class Dotenv implements Adapter

src/Adapter/Env.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
* @author Sebastian Feldmann <sebastian@phpbu.de>
1212
* @copyright Sebastian Feldmann <sebastian@phpbu.de>
1313
* @license https://opensource.org/licenses/MIT The MIT License (MIT)
14-
* @link http://phpbu.de/
14+
* @link https://phpbu.de/
1515
* @since Class available since Release 4.0.0
1616
*/
1717
class Env implements Adapter

src/Adapter/PHPArray.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
* @author Sebastian Feldmann <sebastian@phpbu.de>
1515
* @copyright Sebastian Feldmann <sebastian@phpbu.de>
1616
* @license https://opensource.org/licenses/MIT The MIT License (MIT)
17-
* @link http://phpbu.de/
17+
* @link https://phpbu.de/
1818
* @since Class available since Release 4.0.1
1919
*/
2020
class PHPArray implements Adapter

0 commit comments

Comments
 (0)