tec: Upgrade Minz to the last version

Author: marienfressinaud

<

@@ -6,6 +6,15 @@
 
 PHP 8.1+ is now required. Please check your version before updating flusio!
 
+The CLI command to execute a single job has changed.
+You should now execute:
+
+```console
+$ php cli jobs watch --stop-after=1
+```
+
+The `run` command now takes a job id to execute a specific job.
+
 ## 2023-04-07 - v0.54
 
 ### Security

CHANGELOG.md

@@ -2,6 +2,8 @@
 
 USER = $(shell id -u):$(shell id -g)
 
+DOCKER_COMPOSE = docker-compose -p flusio -f docker/docker-compose.yml
+
 ifdef NO_DOCKER
 	PHP = php
 	COMPOSER = composer
@@ -33,15 +35,15 @@ endif
 .PHONY: docker-start
 docker-start: .env ## Start a development server with Docker
 	@echo "Running webserver on http://localhost:8000"
-	docker-compose -p flusio -f docker/docker-compose.yml up
+	$(DOCKER_COMPOSE) up
 
 .PHONY: docker-clean
 docker-clean: ## Stop and clean Docker server
-	docker-compose -p flusio -f docker/docker-compose.yml down
+	$(DOCKER_COMPOSE) down
 
 .PHONY: docker-build
 docker-build: ## Rebuild the Docker images
-	docker-compose -p flusio -f docker/docker-compose.yml build
+	$(DOCKER_COMPOSE) build
 
 .PHONY: install
 install: ## Install the dependencies
@@ -50,10 +52,7 @@ install: ## Install the dependencies
 
 .PHONY: setup
 setup: .env ## Setup the application system
-	$(CLI) system setup
-
-.PHONY: update
-update: setup ## Update the application
+	$(CLI) migrations setup --seed
 
 .PHONY: rollback
 rollback: ## Reverse the last migration
@@ -65,8 +64,12 @@ endif
 
 .PHONY: reset
 reset: ## Reset the database
-	rm data/migrations_version.txt || true
-	$(CLI) system setup
+ifndef FORCE
+	$(error Please run the operation with FORCE=true)
+endif
+	$(DOCKER_COMPOSE) stop job_worker
+	$(CLI) migrations reset --force --seed
+	$(DOCKER_COMPOSE) start job_worker
 
 .PHONY: icons-build
 icons-build: ## Build the icons asset

Makefile

@@ -16,66 +16,11 @@ $app_path = __DIR__;
 include $app_path . '/autoload.php';
 \Minz\Configuration::load('dotenv', $app_path);
 \Minz\Configuration::$no_syslog_output = true;
-\Minz\Environment::initialize();
 
-// Read command line parameters to create a Request
-$command = [];
-$parameters = [];
-
-// We need to skip the first argument which is the name of the script
-$arguments = array_slice($argv, 1);
-foreach ($arguments as $argument) {
-    $result = preg_match('/^--(?P<option>\w+)(=(?P<argument>.+))?$/sm', $argument, $matches);
-    if ($result) {
-        $parameters[$matches['option']] = $matches['argument'] ?? true;
-    } else {
-        $command[] = $argument;
-    }
-}
-
-$request_uri = implode('/', $command);
-if (!$request_uri) {
-    $request_uri = '/help';
-} elseif ($request_uri[0] !== '/') {
-    $request_uri = '/' . $request_uri;
-}
-
-try {
-    $request = new \Minz\Request('cli', $request_uri, $parameters);
-} catch (\Minz\Errors\RequestError $e) {
-    die($e->getMessage() . "\n");
-}
-
-$request->setParam('bin', $argv[0]);
+$request = \Minz\Request::initFromCli($argv);
 
 // Initialize the Application and execute the request to get a Response
 $application = new \flusio\cli\Application();
 $response = $application->run($request);
 
-if ($response instanceof Generator) {
-    // This is used by the JobsWorker#watch method in order to provide a
-    // long-running service.
-    foreach ($response as $response_part) {
-        $output = $response_part->render();
-        if ($output) {
-            echo $output . "\n";
-        }
-    }
-
-    exit(0);
-} else {
-    // Display the content
-    $output = $response->render();
-    if ($output && $output[-1] === "\n") {
-        echo $output;
-    } elseif ($output) {
-        echo $output . "\n";
-    }
-
-    $code = $response->code();
-    if ($code >= 200 && $code < 300) {
-        exit(0);
-    } else {
-        exit(1);
-    }
-}
+\Minz\Response::sendToCli($response);

cli

@@ -56,7 +56,6 @@
         'feeds_links_keep_minimum' => $feeds_links_keep_minimum,
         'feeds_links_keep_maximum' => $feeds_links_keep_maximum,
         'feeds_links_keep_period' => $feeds_links_keep_period,
-        'job_adapter' => 'database',
         'job_feeds_sync_count' => $job_feeds_sync_count,
         'job_links_sync_count' => $job_links_sync_count,
         'server_ips' => $server_ips,
@@ -86,4 +85,6 @@
             'secure' => $dotenv->pop('SMTP_SECURE', ''),
         ],
     ],
+
+    'jobs_adapter' => 'database',
 ];

configuration/environment_development.php

@@ -59,7 +59,6 @@
         'feeds_links_keep_minimum' => $feeds_links_keep_minimum,
         'feeds_links_keep_maximum' => $feeds_links_keep_maximum,
         'feeds_links_keep_period' => $feeds_links_keep_period,
-        'job_adapter' => 'database',
         'job_feeds_sync_count' => $job_feeds_sync_count,
         'job_links_sync_count' => $job_links_sync_count,
         'server_ips' => $server_ips,
@@ -87,4 +86,6 @@
             'secure' => $dotenv->pop('SMTP_SECURE', ''),
         ],
     ],
+
+    'jobs_adapter' => 'database',
 ];

configuration/environment_production.php

@@ -4,7 +4,7 @@
 $db_port = intval($dotenv->pop('DB_PORT', '5432'));
 $db_name = 'flusio_test';
 
-$temporary_directory = sys_get_temp_dir() . '/flusio/' . \flusio\utils\Random::hex(10);
+$temporary_directory = sys_get_temp_dir() . '/flusio/' . \Minz\Random::hex(10);
 $data_directory = $temporary_directory . '/data';
 $cache_directory = $temporary_directory . '/cache';
 $media_directory = $temporary_directory . '/media';
@@ -47,7 +47,6 @@
         'feeds_links_keep_period' => 0,
         'feeds_links_keep_minimum' => 0,
         'feeds_links_keep_maximum' => 0,
-        'job_adapter' => 'test',
         'job_feeds_sync_count' => 1,
         'job_links_sync_count' => 1,
         'server_ips' => [],
@@ -67,6 +66,8 @@
         'from' => 'root@localhost',
     ],
 
+    'jobs_adapter' => 'test',
+
     'data_path' => $data_directory,
     'tmp_path' => $temporary_directory,
     'no_syslog_output' => true,

configuration/environment_test.php

@@ -76,7 +76,7 @@ should be a `bad request` HTTP response returning the current `GET` view:
 
 ```php
 $csrf = $request->param('csrf');
-if (!\Minz\CSRF::validate($csrf)) {
+if (!\Minz\Csrf::validate($csrf)) {
     return Response::badRequest('get view pointer', [
         'error' => _('A security verification failed: you should retry to submit the form.'),
     ]);
@@ -158,7 +158,7 @@ Or if an error is expected, you should store the error message as a `Flash`
 variable and redirect to the `from` parameter:
 
 ```php
-utils\Flash::set('error', _('A problem happened.'));
+\Minz\Flash::set('error', _('A problem happened.'));
 return Response::found($from);
 ```
 

docs/errors.md

@@ -84,7 +84,7 @@ flusio# chmod 400 .env
 You must now load the SQL schema to your database. You can do it with:
 
 ```console
-flusio# sudo -u www-data php cli system setup
+flusio# sudo -u www-data php cli migrations setup --seed
 flusio# # OR via make
 flusio# sudo -u www-data make setup NO_DOCKER=true
 ```
@@ -192,7 +192,7 @@ have permission on your server to create a new service. An alternative is to
 setup a cron task:
 
 ```cron
-* * * * * www-data php /var/www/flusio/cli jobs run >/dev/null 2>&1
+* * * * * www-data php /var/www/flusio/cli jobs watch --stop-after=1 >/dev/null 2>&1
 ```
 
 It will find and run a single job every minute. It’s less efficient than a

docs/production.md

@@ -25,7 +25,7 @@ flusio# chown -R www-data:www-data .
 Then, apply the migrations and load seeds with:
 
 ```console
-flusio$ sudo -u www-data make update NO_DOCKER=true
+flusio$ sudo -u www-data make setup NO_DOCKER=true
 ```
 
 Finally, you might need to restart PHP and the job worker so it detects
@@ -63,8 +63,8 @@ flusio$ git checkout PREVIOUS_TAG
 If something goes really wrong with the database, you can use the joker command:
 
 ```console
-flusio$ sudo -u www-data make reset NO_DOCKER=true
+flusio$ sudo -u www-data make reset FORCE=true
 ```
 
-It will reset the database and reload the schema. **Obviously, you should avoid
-this command in production or you will erase all the data.**
+It will reset the database and reload the schema. **Note this command doesn't
+work in production.**