From 884f8f186ae2ac6a5c5f78252459a67fe8aecb6c Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Mon, 7 Sep 2020 20:18:56 +1000
Subject: [PATCH] Clean up for improvements to composer

---
 app/Console/Commands/CheckData.php        |  9 ++++
 app/Console/Commands/CreateTestData.php   |  9 ++++
 app/Console/Commands/DemoMode.php         |  9 ++++
 app/Console/Commands/DesignUpdate.php     |  9 ++++
 app/Console/Commands/ImportMigrations.php |  9 ++++
 app/Console/Commands/PostUpdate.php       | 62 +++++------------------
 app/Console/Commands/SendTestEmails.php   |  9 ++++
 app/DataMapper/Analytics/LoginFailure.php |  9 ++++
 app/DataMapper/Analytics/LoginSuccess.php |  9 ++++
 9 files changed, 85 insertions(+), 49 deletions(-)

diff --git a/app/Console/Commands/CheckData.php b/app/Console/Commands/CheckData.php
index 9d9ad28ca550..73c9fc5f7c6e 100644
--- a/app/Console/Commands/CheckData.php
+++ b/app/Console/Commands/CheckData.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Console\Commands;
 
diff --git a/app/Console/Commands/CreateTestData.php b/app/Console/Commands/CreateTestData.php
index 7b04e95db41a..19744925f012 100644
--- a/app/Console/Commands/CreateTestData.php
+++ b/app/Console/Commands/CreateTestData.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Console\Commands;
 
diff --git a/app/Console/Commands/DemoMode.php b/app/Console/Commands/DemoMode.php
index 346ed25d570c..a3169be260d3 100644
--- a/app/Console/Commands/DemoMode.php
+++ b/app/Console/Commands/DemoMode.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Console\Commands;
 
diff --git a/app/Console/Commands/DesignUpdate.php b/app/Console/Commands/DesignUpdate.php
index e5466438dabc..22ee28b466b0 100644
--- a/app/Console/Commands/DesignUpdate.php
+++ b/app/Console/Commands/DesignUpdate.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Console\Commands;
 
diff --git a/app/Console/Commands/ImportMigrations.php b/app/Console/Commands/ImportMigrations.php
index f15ab1e858cf..d11baaeb3633 100644
--- a/app/Console/Commands/ImportMigrations.php
+++ b/app/Console/Commands/ImportMigrations.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Console\Commands;
 
diff --git a/app/Console/Commands/PostUpdate.php b/app/Console/Commands/PostUpdate.php
index def9f4237c37..f66d651062f2 100644
--- a/app/Console/Commands/PostUpdate.php
+++ b/app/Console/Commands/PostUpdate.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Console\Commands;
 
@@ -35,6 +44,7 @@ class PostUpdate extends Command
      */
     public function handle()
     {
+      
         set_time_limit(0);
 
         info('running post update');
@@ -51,62 +61,16 @@ class PostUpdate extends Command
             \Log::error("I wasn't able to optimize.");
         }
 
-// Composer\Factory::getHomeDir() method 
-// needs COMPOSER_HOME environment variable set
+        /* For the following to work, the web user (www-data) must own all the directories */
+
         putenv('COMPOSER_HOME=' . __DIR__ . '/vendor/bin/composer');
 
-        // call `composer install` command programmatically
         $input = new ArrayInput(array('command' => 'install'));
         $application = new Application();
         $application->setAutoExit(false); 
-        $out = $application->run($input);
+        $application->run($input);
 
-        print_r($out);
         echo "Done.";
 
-        // $composer_data = [
-        //   'url' => 'https://getcomposer.org/composer.phar',
-        //   'dir' => __DIR__.'/.code',
-        //   'bin' => __DIR__.'/.code/composer.phar',
-        //   'json' => __DIR__.'/.code/composer.json',
-        //   'conf' => [
-        //     'autoload' => [
-        //       'psr-4' => [
-        //         '' => 'local/',
-        //       ],
-        //     ],
-        //   ],
-        // ];
-
-        // if (! is_dir($composer_data['dir'])) {
-        //     mkdir($composer_data['dir'], 0777, true);
-        // }
-
-        // if (! is_dir("{$composer_data['dir']}/local")) {
-        //     mkdir("{$composer_data['dir']}/local", 0777, true);
-        // }
-
-        // copy($composer_data['url'], $composer_data['bin']);
-        // require_once "phar://{$composer_data['bin']}/src/bootstrap.php";
-
-        // $conf_json = json_encode($composer_data['conf'], JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
-        // file_put_contents($composer_data['json'], $conf_json);
-        // chdir($composer_data['dir']);
-        // putenv("COMPOSER_HOME={$composer_data['dir']}");
-        // putenv('OSTYPE=OS400');
-        // $app = new \Composer\Console\Application();
-
-        // $factory = new \Composer\Factory();
-        // $output = $factory->createOutput();
-
-        // $input = new \Symfony\Component\Console\Input\ArrayInput([
-        //   'command' => 'install',
-        // ]);
-        // $input->setInteractive(false);
-        // echo '<pre>';
-        // $cmdret = $app->doRun($input, $output);
-        // echo 'end!';
-
-        // \Log::error(print_r($cmdret, 1));
     }
 }
diff --git a/app/Console/Commands/SendTestEmails.php b/app/Console/Commands/SendTestEmails.php
index badff65c13d7..514cda83f083 100644
--- a/app/Console/Commands/SendTestEmails.php
+++ b/app/Console/Commands/SendTestEmails.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\Console\Commands;
 
diff --git a/app/DataMapper/Analytics/LoginFailure.php b/app/DataMapper/Analytics/LoginFailure.php
index fb2a8acf46ac..06a1693f68ec 100644
--- a/app/DataMapper/Analytics/LoginFailure.php
+++ b/app/DataMapper/Analytics/LoginFailure.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\DataMapper\Analytics;
 
diff --git a/app/DataMapper/Analytics/LoginSuccess.php b/app/DataMapper/Analytics/LoginSuccess.php
index 2ae3dbd63c95..c016f2c19e07 100644
--- a/app/DataMapper/Analytics/LoginSuccess.php
+++ b/app/DataMapper/Analytics/LoginSuccess.php
@@ -1,4 +1,13 @@
 <?php
+/**
+ * Invoice Ninja (https://invoiceninja.com).
+ *
+ * @link https://github.com/invoiceninja/invoiceninja source repository
+ *
+ * @copyright Copyright (c) 2020. Invoice Ninja LLC (https://invoiceninja.com)
+ *
+ * @license https://opensource.org/licenses/AAL
+ */
 
 namespace App\DataMapper\Analytics;