From 9d831ea808bb6bc59abf51a3cd90a7d8f38bf310 Mon Sep 17 00:00:00 2001 From: Dasc3er Date: Fri, 6 Aug 2021 17:29:58 +0200 Subject: [PATCH] Gestione legacy come pacchetto Laravel Al momento, la versione legacy deve trovarsi un una cartella di nome legacy/ allo stesso livello del progetto. --- .gitmodules | 4 - app/Exceptions/LegacyExitException.php | 9 --- app/Exceptions/LegacyRedirectException.php | 14 ---- app/Http/Controllers/LegacyController.php | 79 -------------------- app/Http/Kernel.php | 16 ---- app/Http/Middleware/EnsureCalendarPeriod.php | 4 +- app/Providers/RouteServiceProvider.php | 4 - composer.json | 70 +++-------------- legacy | 1 - routes/legacy.php | 9 --- 10 files changed, 11 insertions(+), 199 deletions(-) delete mode 100644 .gitmodules delete mode 100644 app/Exceptions/LegacyExitException.php delete mode 100644 app/Exceptions/LegacyRedirectException.php delete mode 100644 app/Http/Controllers/LegacyController.php delete mode 160000 legacy delete mode 100644 routes/legacy.php diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 363a689ac..000000000 --- a/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "legacy"] - path = legacy - url = https://github.com/devcode-it/openstamanager.git - branch = legacy diff --git a/app/Exceptions/LegacyExitException.php b/app/Exceptions/LegacyExitException.php deleted file mode 100644 index ff0bb04d0..000000000 --- a/app/Exceptions/LegacyExitException.php +++ /dev/null @@ -1,9 +0,0 @@ -getPathInfo(), 1); - - // Gestione dell'output - $output = self::simulate($path); - $response = response($output); - - // Fix content-type per contenuti non HTML - if (ends_with($path, '.js')) { - $response = $response->header('Content-Type', 'application/javascript'); - } elseif (string_contains($path, 'pdfgen.php')) { - $response = $response->header('Content-Type', 'application/pdf'); - } - // Correzione header per API - elseif (self::isApiRequest($path)) { - $output = json_decode($output, true); - $response = $response->header('Content-Type', 'application/json') - ->setStatusCode($output['status']); - } - - return $response; - } - - public static function simulate($path) - { - $base_path = base_path('legacy'); - - // Fix per redirect all'API - $api_request = self::isApiRequest($path); - if ($api_request) { - $path = 'api/index.php'; - } - - // Ricerca del file interessato - $file = realpath($base_path.'/'.$path); - if (strpos($file, $base_path) === false) { - throw new NotFoundHttpException(); - } - - // Inclusione diretta del file - ob_start(); - try { - require $file; - } catch (LegacyExitException $e) { - } catch (LegacyRedirectException $e) { - return Redirect::to($e->getMessage()); - } - - // Gestione dell'output - $output = ob_get_clean(); - - return $output; - } - - protected static function isApiRequest($path) - { - // Fix per redirect all'API - $api_request = false; - if (in_array($path, ['api', 'api/', 'api/index.php'])) { - $api_request = true; - } - - return $api_request; - } -} diff --git a/app/Http/Kernel.php b/app/Http/Kernel.php index 2a8311351..c749c637a 100644 --- a/app/Http/Kernel.php +++ b/app/Http/Kernel.php @@ -54,22 +54,6 @@ class Kernel extends HttpKernel 'throttle:api', \Illuminate\Routing\Middleware\SubstituteBindings::class, ], - - 'legacy' => [ - EnsureEnvFile::class, - \App\Http\Middleware\EncryptCookies::class, - \Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class, - \Illuminate\Session\Middleware\StartSession::class, - // \Illuminate\Session\Middleware\AuthenticateSession::class, - \Illuminate\View\Middleware\ShareErrorsFromSession::class, - // \App\Http\Middleware\VerifyCsrfToken::class, - \Illuminate\Routing\Middleware\SubstituteBindings::class, - - Language::class, - EnsureCalendarPeriod::class, - EnsureConfiguration::class, - HTMLBuilder::class, - ], ]; /** diff --git a/app/Http/Middleware/EnsureCalendarPeriod.php b/app/Http/Middleware/EnsureCalendarPeriod.php index 0e95af5f9..e357a9f38 100644 --- a/app/Http/Middleware/EnsureCalendarPeriod.php +++ b/app/Http/Middleware/EnsureCalendarPeriod.php @@ -22,11 +22,11 @@ class EnsureCalendarPeriod // Calendario // Periodo di visualizzazione if (!empty($request_period['period_start'])) { - session(null, $request_period); + session($request_period); } // Dal 01-01-yyy al 31-12-yyyy elseif (session('period_start') === null) { - session(null, [ + session([ 'period_start' => date('Y').'-01-01', 'period_end' => date('Y').'-12-31', ]); diff --git a/app/Providers/RouteServiceProvider.php b/app/Providers/RouteServiceProvider.php index 3fba27369..affd6daa7 100644 --- a/app/Providers/RouteServiceProvider.php +++ b/app/Providers/RouteServiceProvider.php @@ -46,10 +46,6 @@ class RouteServiceProvider extends ServiceProvider Route::middleware('web') ->namespace($this->namespace) ->group(base_path('routes/web.php')); - - Route::middleware('legacy') - ->namespace($this->namespace) - ->group(base_path('routes/legacy.php')); }); } diff --git a/composer.json b/composer.json index 707d40623..07a9c6fd4 100644 --- a/composer.json +++ b/composer.json @@ -28,31 +28,20 @@ "ext-simplexml": "*", "ext-xsl": "*", "ext-zip": "*", - "aluguest/ical-easy-reader": "^1.5", "barryvdh/laravel-debugbar": "^3.5", "danielstjules/stringy": "^3.1", - "davidepastore/codice-fiscale": "^0.6.0", "devcode-it/aggiornamenti": "@dev", "devcode-it/causali-trasporto": "@dev", - "ezyang/htmlpurifier": "^4.8", + "devcode-it/legacy": "@dev", "fideloper/proxy": "^4.4", "filp/whoops": "^2.1", "fruitcake/laravel-cors": "^2.0", "guzzlehttp/guzzle": "^7.0.1", - "ifsnop/mysqldump-php": "^2.3", "intervention/image": "^2.3", "laravel/framework": "^8.12", "laravel/tinker": "^2.5", - "league/csv": "^8.2", - "mpdf/mpdf": "^8.0.10", - "mpociot/vat-calculator": "^2.3", - "owasp/csrf-protector-php": "^1.0", - "phpmailer/phpmailer": "^6.0", - "respect/validation": "^1.1", - "servo/fluidxml": "^1.21", "symfony/polyfill-ctype": "^1.8", "symfony/polyfill-php70": "^1.8", - "willdurand/geocoder": "^3.3", "zerospam/laravel-gettext": "^7.2" }, "require-dev": { @@ -72,60 +61,12 @@ }, "autoload": { "psr-4": { - "": "legacy/src/", - "Modules\\Aggiornamenti\\": ["legacy/modules/aggiornamenti/custom/src/", "legacy/modules/aggiornamenti/src/"], - "Modules\\Anagrafiche\\": ["legacy/modules/anagrafiche/custom/src/", "legacy/modules/anagrafiche/src/"], - "Modules\\Backups\\": ["legacy/modules/backups/custom/src/", "legacy/modules/backups/src/"], - "Modules\\Banche\\": ["legacy/modules/banche/custom/src/", "legacy/modules/banche/src/"], - "Modules\\Emails\\": ["legacy/modules/emails/custom/src/", "legacy/modules/emails/src/"], - "Modules\\Articoli\\": ["legacy/modules/articoli/custom/src/", "legacy/modules/articoli/src/"], - "Modules\\Checklists\\": ["legacy/modules/checklists/custom/src/", "legacy/modules/checklists/src/"], - "Modules\\Ritenute\\": ["legacy/modules/ritenute/custom/src/", "legacy/modules/ritenute/src/"], - "Modules\\RitenuteContributi\\": ["legacy/modules/ritenute_contributi/custom/src/", "legacy/modules/ritenute_contributi/src/"], - "Modules\\Rivalse\\": ["legacy/modules/rivalse/custom/src/", "legacy/modules/rivalse/src/"], - "Modules\\Newsletter\\": ["legacy/modules/newsletter/custom/src/", "legacy/modules/newsletter/src/"], - "Modules\\Iva\\": ["legacy/modules/iva/custom/src/", "legacy/modules/iva/src/"], - "Modules\\DDT\\": ["legacy/modules/ddt/custom/src/", "legacy/modules/ddt/src/"], - "Modules\\Fatture\\": ["legacy/modules/fatture/custom/src/", "legacy/modules/fatture/src/"], - "Modules\\Ordini\\": ["legacy/modules/ordini/custom/src/", "legacy/modules/ordini/src/"], - "Modules\\Preventivi\\": ["legacy/modules/preventivi/custom/src/", "legacy/modules/preventivi/src/"], - "Modules\\Contratti\\": ["legacy/modules/contratti/custom/src/", "legacy/modules/contratti/src/"], - "Modules\\Interventi\\": ["legacy/modules/interventi/custom/src/", "legacy/modules/interventi/src/"], - "Modules\\Pagamenti\\": ["legacy/modules/pagamenti/custom/src/", "legacy/modules/pagamenti/src/"], - "Modules\\Statistiche\\": ["legacy/modules/statistiche/custom/src/", "legacy/modules/statistiche/src/"], - "Modules\\Scadenzario\\": ["legacy/modules/scadenzario/custom/src/", "legacy/modules/scadenzario/src/"], - "Modules\\PrimaNota\\": ["legacy/modules/primanota/custom/src/", "legacy/modules/primanota/src/"], - "Modules\\Utenti\\": ["legacy/modules/utenti/custom/src/", "legacy/modules/utenti/src/"], - "Modules\\StatoServizi\\": ["legacy/modules/stato_servizi/custom/src/", "legacy/modules/stato_servizi/src/"], - "Modules\\StatiIntervento\\": ["legacy/modules/stati_intervento/custom/src/", "legacy/modules/stati_intervento/src/"], - "Modules\\StatiPreventivo\\": ["legacy/modules/stati_preventivo/custom/src/", "legacy/modules/stati_preventivo/src/"], - "Modules\\StatiContratto\\": ["legacy/modules/stati_contratto/custom/src/", "legacy/modules/stati_contratto/src/"], - "Modules\\TipiIntervento\\": ["legacy/modules/tipi_intervento/custom/src/", "legacy/modules/tipi_intervento/src/"], - "Modules\\CategorieDocumentali\\": ["legacy/modules/categorie_documenti/custom/src/", "legacy/modules/categorie_documenti/src/"], - "Modules\\PianiSconto\\": ["legacy/modules/piano_sconto/custom/src/", "legacy/modules/piano_sconto/src/"], - "Modules\\Impianti\\": ["legacy/modules/impianti/custom/src/", "legacy/modules/impianti/src/"], - "Modules\\Impostazioni\\": ["legacy/modules/impostazioni/custom/src/", "legacy/modules/impostazioni/src/"], - "Plugins\\ExportFE\\": ["legacy/plugins/exportFE/custom/src/", "legacy/plugins/exportFE/src/"], - "Plugins\\ImportFE\\": ["legacy/plugins/importFE/custom/src/", "legacy/plugins/importFE/src/"], - "Plugins\\ReceiptFE\\": ["legacy/plugins/receiptFE/custom/src/", "legacy/plugins/receiptFE/src/"], - "Plugins\\DichiarazioniIntento\\": ["legacy/plugins/dichiarazioni_intento/custom/src/", "legacy/plugins/dichiarazioni_intento/src/"], - "Plugins\\PianificazioneInterventi\\": ["legacy/plugins/pianificazione_interventi/custom/src/", "legacy/plugins/pianificazione_interventi/src/"], - "Plugins\\PianificazioneFatturazione\\": ["legacy/plugins/pianificazione_fatturazione/custom/src/", "legacy/plugins/pianificazione_fatturazione/src/"], - "Plugins\\StatisticheArticoli\\": ["legacy/plugins/statistiche_articoli/custom/src/", "legacy/plugins/statistiche_articoli/src/"], - "Plugins\\DettagliArticolo\\": ["legacy/plugins/dettagli_articolo/custom/src/", "legacy/plugins/dettagli_articolo/src/"], - "App\\": "app/", - "Modules\\": "modules/", "Database\\Factories\\": "database/factories/", "Database\\Seeders\\": "database/seeders/" }, "files": [ - "app/helpers.php", - "legacy/lib/functions.php", - "legacy/lib/common.php", - "legacy/lib/helpers.php", - "legacy/lib/util.php", - "legacy/lib/deprecated.php" + "app/helpers.php" ] }, "autoload-dev": { @@ -168,6 +109,13 @@ "options": { "symlink": true } + }, + "devcode-it/legacy": { + "type": "path", + "url": "../legacy", + "options": { + "symlink": true + } } } } diff --git a/legacy b/legacy deleted file mode 160000 index af0668f0c..000000000 --- a/legacy +++ /dev/null @@ -1 +0,0 @@ -Subproject commit af0668f0c2e9751c36430e1b7595a1d32058ef64 diff --git a/routes/legacy.php b/routes/legacy.php deleted file mode 100644 index 241b35a1e..000000000 --- a/routes/legacy.php +++ /dev/null @@ -1,9 +0,0 @@ -name('legacy') - ->where('path', '.*');