Merge pull request #3497 from ampache/patch6

6.0.0

.github/CONTRIBUTING.md

@@ -141,7 +141,7 @@ declare(strict_types=1);
  * vim:set softtabstop=4 shiftwidth=4 expandtab:
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPL-3.0-or-later)
- * Copyright 2001 - 2022 Ampache.org
+ * Copyright Ampache.org, 2001-2023
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

.github/workflows/unittests.yml

@@ -12,15 +12,15 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-20.04]
-        php: [8.0]
+        os: [ubuntu-22.04]
+        php: [8.2]
     steps:
       - uses: actions/checkout@v2
 
       - name: Setup PHP
         uses: shivammathur/setup-php@v2
         with:
-          php-version: '8.0'
+          php-version: '8.2'
 
       - name: Validate composer.json and composer.lock
         run: composer validate

.gitignore

@@ -1,27 +1,30 @@
+.fleet/
+.idea/
 .settings/
+.tx/config_*.bak
 .vscode/
-.idea/
 .buildpath
 .env
 .pc
 .php_cs.cache
 .phpunit.result.cache
 .project
 bootstrap/
-build
+build/
 config/ampache-doped.cfg.php
 config/ampache.cfg.php
+config/ampache.cfg.php.backup
 config/registration_agreement.php
-docker/media/*
+docker/media/
 log/
 logs/
 nbproject/
 node_modules/
 public/.maintenance
-public/channel/.htaccess
 public/play/.htaccess
 public/rest/.htaccess
 public/lib/components
+public/lib/javascript/custom.js
 public/client
 public/newclient
 public/core
@@ -31,7 +34,7 @@ public/foam
 public/ample
 storage/
 tmp/
-/vendor/
+vendor/
 composer.lock
 composer.phar
 cs_fixer_tmp_*
@@ -50,4 +53,3 @@ web.config
 *.swp
 *.v11.suo
 *~
-config/ampache.cfg.php.backup

.php-cs-fixer.php

@@ -10,11 +10,21 @@
 $config = new PhpCsFixer\Config();
 return $config->setRules([
         '@PSR2' => true,
-        'binary_operator_spaces' => ['operators' => ['=' => 'align']],
+        'binary_operator_spaces' => [
+            'operators' => ['=' => 'align']
+        ],
         'blank_line_after_namespace' => true,
-        'blank_line_before_statement' => ['statements' => ['declare', 'return']],
-        'braces' => ['allow_single_line_closure' => true],
-        'concat_space' => ['spacing' => 'one'],
+        'blank_line_before_statement' => [
+            'statements' => ['declare', 'return']
+        ],
+        'concat_space' => [
+            'spacing' => 'one'
+        ],
+        'curly_braces_position' => [
+            'functions_opening_brace' => 'next_line_unless_newline_at_signature_end',
+            'allow_single_line_empty_anonymous_classes' => true,
+            'allow_single_line_anonymous_functions' => true
+        ],
         'constant_case' => true,
         'elseif' => true,
         'encoding' => true,
@@ -27,10 +37,10 @@
         'single_blank_line_at_eof' => true,
         'strict_param' => false,
         'visibility_required' => false,
-     ])
-   ->setIndent("    ")
-   ->setUsingCache(false)
-   ->setFinder($finder)
-   ->setLineEnding("\n")
+    ])
+    ->setIndent("    ")
+    ->setUsingCache(false)
+    ->setFinder($finder)
+    ->setLineEnding("\n")
 ;
 

.scrutinizer.yml

@@ -1,7 +1,7 @@
 build:
     environment:
         php:
-            version: "8.1"
+            version: "8.2"
 filter:
     excluded_paths:
         - 'public/lib/components/*'

.tx/config

@@ -1,8 +1,9 @@
 [main]
 host = https://www.transifex.com
 
-[ampache.messagespot]
+[o:ampache:p:ampache:r:messagespot]
 file_filter = locale/<lang>/LC_MESSAGES/messages.po
 source_file = locale/base/messages.pot
 source_lang = en
-type = PO
+type        = PO
+

CONTRIBUTING.md

@@ -141,7 +141,7 @@ declare(strict_types=1);
  * vim:set softtabstop=4 shiftwidth=4 expandtab:
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPL-3.0-or-later)
- * Copyright 2001 - 2022 Ampache.org
+ * Copyright Ampache.org, 2001-2023
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by

README.md

@@ -8,16 +8,7 @@
 
 ## News
 
-Private catalogs have been given a lot of love and the update has now merged into develop.
-
-This feature will be released in Ampache 5.5.0 and will allow you to assign a catalog to multiple users instead of just one.
-
-Check out the [wiki](https://github.com/ampache/ampache/wiki/catalog-filters) for more information about this feature.
-
-
-The old and long ignored module [jPlayer](https://github.com/jplayer/jPlayer) has been forked into the base Ampache code.
-
-There have been a few fixes and changes to the module to make the webplayer a lot better to use.
+Ampache6 is about to shake up the develop branch. Keep track using the [wiki](https://github.com/ampache/ampache/wiki/ampache6-details)
 
 ## Basics
 
@@ -60,9 +51,12 @@ Please see [the wiki](https://github.com/ampache/ampache/wiki/Installation) and
   * IIS
 
 * PHP 7.1-7.4 (Ampache 4.x.x)
-* PHP 7.4 (Ampache 5.0.x)
+* PHP 7.4 (Ampache 5.0.x and higher)
 * PHP 8.0 (Ampache 5.1.x and higher)
-* PHP 8.1 (TBC)
+* PHP 8.1 (Ampache 5.5.0 and higher)
+* PHP 8.2 (Ampache 6.0.0 and higher)
+
+**NOTE** That php7.4 will not be released for Ampache6 but can still be used.
 
 * PHP modules:
   * PDO
@@ -85,8 +79,8 @@ Please see [the wiki](https://github.com/ampache/ampache/wiki/Installation) and
 
 If you are upgrading from an older version of Ampache we recommend
 moving the old directory out of the way, extracting the new copy in
-its place and then copying the old /config/ampache.cfg.php, /rest/.htaccess,
-/channel/.htaccess, and /play/.htaccess files if any.
+its place and then copying the old /config/ampache.cfg.php,
+/rest/.htaccess, and /play/.htaccess files if any.
 All database updates will be handled by Ampache.
 
 ## License

SECURITY.md

@@ -2,13 +2,15 @@
 
 ## Supported Versions
 
-Now that version 5 is out all 4.x releases are considered supported until the end of PHP7.4 security support.
+Version 6 is in development and version 4 is now considered depreciated after the php7.4 EOL
+
+Version 5 will likely remain supported for as long as php8 is supported.
 
 | Version | Supported          |
 | ------- | ------------------ |
+| 6.x.x   | :white_check_mark: |
 | 5.x.x   | :white_check_mark: |
-| 4.x.x   | :white_check_mark: |
-| < 4.0   | :x:                |
+| <= 4.0  | :x:                |
 
 ## Reporting a Vulnerability
 

bin/cli

@@ -4,7 +4,7 @@
  * vim:set softtabstop=4 shiftwidth=4 expandtab:
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPL-3.0-or-later)
- * Copyright 2001 - 2022 Ampache.org
+ * Copyright Ampache.org, 2001-2023
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -43,27 +43,28 @@ $app = new Ahc\Cli\Application(
     'Ampache CLI',
     $dic->get(ConfigContainerInterface::class)->get('version')
 );
+$app->add($dic->get(Cli\AdminAddUserCommand::class));
+$app->add($dic->get(Cli\AdminUpdateDatabaseCommand::class));
+$app->add($dic->get(Cli\ArtCleanupCommand::class));
+$app->add($dic->get(Cli\ArtSizeCalculationCommand::class));
 $app->add($dic->get(Cli\BroadcastCommand::class));
+$app->add($dic->get(Cli\CacheProcessCommand::class));
 $app->add($dic->get(Cli\ComputeCacheCommand::class));
+$app->add($dic->get(Cli\ConvertFileNamesCommand::class));
 $app->add($dic->get(Cli\CronProcessCommand::class));
-$app->add($dic->get(Cli\CacheProcessCommand::class));
-$app->add($dic->get(Cli\ArtSizeCalculationCommand::class));
-$app->add($dic->get(Cli\RunChannelCommand::class));
-$app->add($dic->get(Cli\PrintTagsCommand::class));
-$app->add($dic->get(Cli\SongCleanupCommand::class));
-$app->add($dic->get(Cli\SortFilesCommand::class));
-$app->add($dic->get(Cli\ExportPlaylistCommand::class));
 $app->add($dic->get(Cli\ExportAlbumArtCommand::class));
 $app->add($dic->get(Cli\ExportArtCommand::class));
-$app->add($dic->get(Cli\ArtCleanupCommand::class));
+$app->add($dic->get(Cli\ExportPlaylistCommand::class));
+$app->add($dic->get(Cli\MoveCatalogPathCommand::class));
+$app->add($dic->get(Cli\PrintTagsCommand::class));
 $app->add($dic->get(Cli\RunWebsocketCommand::class));
-$app->add($dic->get(Cli\UpdateDbCommand::class));
-$app->add($dic->get(Cli\ConvertFileNamesCommand::class));
-$app->add($dic->get(Cli\UpdateCatalogFileCommand::class));
+$app->add($dic->get(Cli\ShowVersionCommand::class));
+$app->add($dic->get(Cli\SongCleanupCommand::class));
+$app->add($dic->get(Cli\SortFilesCommand::class));
 $app->add($dic->get(Cli\UpdateCatalogCommand::class));
-$app->add($dic->get(Cli\AdminAddUserCommand::class));
-$app->add($dic->get(Cli\AdminUpdateDatabaseCommand::class));
-$app->add($dic->get(Cli\MoveCatalogPathCommand::class));
+$app->add($dic->get(Cli\UpdateCatalogFileCommand::class));
+$app->add($dic->get(Cli\UpdateCatalogFolderCommand::class));
+$app->add($dic->get(Cli\UpdateDbCommand::class));
 
 $logo = <<<LOGO
     _                               _          

bin/installer

@@ -4,7 +4,7 @@
  * vim:set softtabstop=4 shiftwidth=4 expandtab:
  *
  * LICENSE: GNU Affero General Public License, version 3 (AGPL-3.0-or-later)
- * Copyright 2001 - 2022 Ampache.org
+ * Copyright Ampache.org, 2001-2023
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by
@@ -23,6 +23,7 @@
 
 declare(strict_types=1);
 
+use Ampache\Module\Cli\HtaccessCommand;
 use Ampache\Module\Cli\InstallerCommand;
 use Psr\Container\ContainerInterface;
 
@@ -39,6 +40,7 @@ $app = new Ahc\Cli\Application(
     'install'
 );
 $app->add($dic->get(InstallerCommand::class));
+$app->add($dic->get(HtaccessCommand::class));
 
 $logo = <<<LOGO
     _                               _