Code Cleanup

geggleto · Oct 28, 2017 · c2efc30 · c2efc30
1 parent b5712e6
commit c2efc30
Show file tree

Hide file tree

Showing 28 changed files with 21,428 additions and 19,861 deletions.
diff --git a/cli/newUser.php b/cli/newUser.php
@@ -11,9 +11,9 @@
 
 include_once __DIR__ . '/../vendor/autoload.php';
 
-$app = new App();
+$app       = new App();
 $container = $app->getContainer();
-$repo = $container->get(UserRepository::class);
+$repo      = $container->get(UserRepository::class);
 
 $user = new User(
     $argv[1],

diff --git a/composer.json b/composer.json
@@ -1,32 +1,47 @@
 {
-    "require": {
-        "slim/slim": "^3.8",
-        "slim/twig-view": "^2.3",
-        "php-di/slim-bridge": "^1.0",
-        "doctrine/orm": "^2.5",
-        "vlucas/phpdotenv": "^2.4",
-        "ramsey/uuid-doctrine": "^1.4",
-        "mailgun/mailgun-php": "^2.3",
-        "php-http/curl-client": "^1.7",
-        "guzzlehttp/psr7": "^1.4",
-        "paragonie/random_compat": "^2.0"
-    },
-    "require-dev" : {
-        "phpunit/phpunit" : "^5.6"
-    },
-    "scripts" : {
-        "gulp": "cd public/assets && npm install && gulp",
-        "post-install-cmd": "@gulp",
-        "db" : "vendor/bin/doctrine orm:schema-tool:update --force"
-    },
-    "autoload" : {
-        "psr-4" : {
-            "MyApp\\" : "src"
-        }
-    },
-    "autoload-dev" : {
-        "psr-4" : {
-            "MyApp\\Tests\\" : "tests"
-        }
+  "name": "geggleto/skelly",
+  "type": "library",
+  "description": "Skelly is a PHP Skeleton Project aimed at getting an MVP up and running quickly",
+  "keywords": [
+    "framework",
+    "bootstrap"
+  ],
+  "license": "MIT",
+  "authors": [
+    {
+      "name": "Glenn Eggleton",
+      "email": "[email protected]",
+      "homepage": "https://glenneggleton.com"
     }
+  ],
+  "require": {
+    "slim/slim": "^3.8",
+    "slim/twig-view": "^2.3",
+    "php-di/slim-bridge": "^1.0",
+    "doctrine/orm": "^2.5",
+    "vlucas/phpdotenv": "^2.4",
+    "ramsey/uuid-doctrine": "^1.4",
+    "mailgun/mailgun-php": "^2.3",
+    "php-http/curl-client": "^1.7",
+    "guzzlehttp/psr7": "^1.4",
+    "paragonie/random_compat": "^2.0"
+  },
+  "require-dev": {
+    "phpunit/phpunit": "^5.6"
+  },
+  "scripts": {
+    "gulp": "cd public/assets && npm install && gulp",
+    "post-install-cmd": "@gulp",
+    "db": "vendor/bin/doctrine orm:schema-tool:update --force"
+  },
+  "autoload": {
+    "psr-4": {
+      "MyApp\\": "src"
+    }
+  },
+  "autoload-dev": {
+    "psr-4": {
+      "MyApp\\Tests\\": "tests"
+    }
+  }
 }
diff --git a/config/di-container.php b/config/di-container.php
@@ -1,6 +1,5 @@
 <?php
 
-use function Clue\StreamFilter\fun;
 use Doctrine\ORM\EntityManager;
 use Doctrine\ORM\Tools\Setup;
 use Mailgun\Mailgun;
@@ -10,13 +9,12 @@
 
 return [
     'settings.displayErrorDetails' => true,
-    'doctrine.paths' => [
-        __DIR__.'/../src/Models/Authentication/Entities'
+    'doctrine.paths'               => [
+        __DIR__ . '/../src/Models/Authentication/Entities',
     ],
-    'mailgun.domain' => 'mg.glenneggleton.com',
-    'email.domain' => 'http://admin.local',
-    EntityManager::class => function (ContainerInterface $container)
-    {
+    'mailgun.domain'               => 'mg.glenneggleton.com',
+    'email.domain'                 => 'http://admin.local',
+    EntityManager::class           => function (ContainerInterface $container) {
         $entityManager = null;
 
         $config = Setup::createAnnotationMetadataConfiguration(
@@ -30,19 +28,19 @@
         $config->setAutoGenerateProxyClasses(true);
 
 
-        $file = __DIR__ . '/doctrine.php';
+        $file     = __DIR__ . '/doctrine.php';
         $dbConfig = include $file;
 
         $entityManager = EntityManager::create($dbConfig, $config);
-        $platform = $entityManager->getConnection()->getDatabasePlatform();
+        $platform      = $entityManager->getConnection()->getDatabasePlatform();
         $platform->registerDoctrineTypeMapping('enum', 'string');
 
         return $entityManager;
     },
-    \Slim\Views\Twig::class => function (ContainerInterface $container) {
+    \Slim\Views\Twig::class        => function (ContainerInterface $container) {
         $view = new \Slim\Views\Twig(__DIR__ . '/../templates', [
             'cache' => false,
-            'debug' => true
+            'debug' => true,
         ]);
 
         // Instantiate and add Slim specific extension
@@ -54,17 +52,14 @@
 
         return $view;
     },
-    Mailgun::class => function (ContainerInterface $container)
-    {
+    Mailgun::class                 => function (ContainerInterface $container) {
         return Mailgun::create($_ENV['MAILGUN']);
     },
-    MailGunAdapter::class => function (ContainerInterface $container)
-    {
+    MailGunAdapter::class          => function (ContainerInterface $container) {
         return new MailGunAdapter($container->get('mailgun.domain'), $container->get(Mailgun::class));
     },
-    MailService::class => function (ContainerInterface $container)
-    {
+    MailService::class             => function (ContainerInterface $container) {
         return $container->get(MailGunAdapter::class);
-    }
+    },
 ];
 
diff --git a/config/doctrine.php b/config/doctrine.php
@@ -3,11 +3,11 @@
 \Doctrine\DBAL\Types\Type::addType('uuid', 'Ramsey\Uuid\Doctrine\UuidType');
 
 return [
-    'driver' => 'pdo_mysql',
-    'user' => $_ENV['DOCTRINE_USERNAME'],
+    'driver'   => 'pdo_mysql',
+    'user'     => $_ENV['DOCTRINE_USERNAME'],
     'password' => $_ENV['DOCTRINE_PASSWORD'],
-    'dbname' => $_ENV['DOCTRINE_DATABASE'],
-    'host' => $_ENV['DOCTRINE_HOST'],
-    'charset' => 'utf8',
-    'port' => $_ENV['DOCTRINE_PORT']
+    'dbname'   => $_ENV['DOCTRINE_DATABASE'],
+    'host'     => $_ENV['DOCTRINE_HOST'],
+    'charset'  => 'utf8',
+    'port'     => $_ENV['DOCTRINE_PORT'],
 ];
diff --git a/config/routes.php b/config/routes.php
@@ -24,7 +24,7 @@
     $this->get('/profile', ShowProfile::class);
 
     $this->group('/api', function () {
-       $this->put('/profile', UpdateUser::class);
+        $this->put('/profile', UpdateUser::class);
     });
 })->add(SecurityMiddleware::class);