jenskooij / cloudcontrol

src/components/BaseComponent.php

Indentation +163 added lines, -163 removed lines

@@ -2,179 +2,179 @@
 
 namespace CloudControl\Cms\components {
 
-    use CloudControl\Cms\cc\Application;
-    use CloudControl\Cms\cc\Request;
-    use CloudControl\Cms\storage\Storage;
+	use CloudControl\Cms\cc\Application;
+	use CloudControl\Cms\cc\Request;
+	use CloudControl\Cms\storage\Storage;
 
-    class BaseComponent implements Component
-    {
-        /**
-         * @var string
-         */
-        protected $template;
-        /**
-         * @var \CloudControl\Cms\cc\Request
-         */
-        protected $request;
-        /**
-         * @var Storage
-         */
-        protected $storage;
-        /**
-         * @var mixed
-         */
-        protected $renderedContent;
-        /**
-         * @var array
-         */
-        protected $parameters = array();
-        /***
+	class BaseComponent implements Component
+	{
+		/**
+		 * @var string
+		 */
+		protected $template;
+		/**
+		 * @var \CloudControl\Cms\cc\Request
+		 */
+		protected $request;
+		/**
+		 * @var Storage
+		 */
+		protected $storage;
+		/**
+		 * @var mixed
+		 */
+		protected $renderedContent;
+		/**
+		 * @var array
+		 */
+		protected $parameters = array();
+		/***
          * @var \stdClass
          */
-        protected $matchedSitemapItem;
+		protected $matchedSitemapItem;
 
-        /**
-         * BaseComponent constructor.
-         *
-         * @param string $template
-         * @param Request $request
-         * @param array $parameters
-         * @param         $matchedSitemapItem
-         */
-        public function __construct($template = '', Request $request, $parameters = array(), $matchedSitemapItem)
-        {
-            $this->template = $template;
-            $this->request = $request;
-            $this->parameters = (array)$parameters;
-            $this->matchedSitemapItem = $matchedSitemapItem;
-        }
+		/**
+		 * BaseComponent constructor.
+		 *
+		 * @param string $template
+		 * @param Request $request
+		 * @param array $parameters
+		 * @param         $matchedSitemapItem
+		 */
+		public function __construct($template = '', Request $request, $parameters = array(), $matchedSitemapItem)
+		{
+			$this->template = $template;
+			$this->request = $request;
+			$this->parameters = (array)$parameters;
+			$this->matchedSitemapItem = $matchedSitemapItem;
+		}
 
-        /**
-         * Hook for implementation in derived classes
-         *
-         * @param Storage $storage
-         */
-        public function run(Storage $storage)
-        {
-            $this->storage = $storage;
-        }
+		/**
+		 * Hook for implementation in derived classes
+		 *
+		 * @param Storage $storage
+		 */
+		public function run(Storage $storage)
+		{
+			$this->storage = $storage;
+		}
 
-        /**
-         * Renders the template
-         *
-         * @param null|Application $application
-         *
-         * @throws \Exception
-         */
-        public function render($application = null)
-        {
-            $this->renderedContent = $this->renderTemplate($this->template, true, $application);
-        }
+		/**
+		 * Renders the template
+		 *
+		 * @param null|Application $application
+		 *
+		 * @throws \Exception
+		 */
+		public function render($application = null)
+		{
+			$this->renderedContent = $this->renderTemplate($this->template, true, $application);
+		}
 
-        /**
-         * Returns the rendered content
-         *
-         * @return mixed
-         */
-        public function get()
-        {
-            return $this->renderedContent;
-        }
+		/**
+		 * Returns the rendered content
+		 *
+		 * @return mixed
+		 */
+		public function get()
+		{
+			return $this->renderedContent;
+		}
 
-        /**
-         * Decoupled render method, for usage in derived classes
-         *
-         * @param string $template
-         *
-         * @param bool $obClean
-         * @param null | Application $application
-         *
-         * @return string
-         * @throws \Exception
-         */
-        public function renderTemplate($template = '', $obClean = true, $application = null)
-        {
-            $templatePath = $this->getTemplatePath($template, $application);
-            if (realpath($templatePath) !== false) {
-                if ($obClean) {
-                    ob_clean();
-                }
-                $this->parameters['request'] = $this->request;
-                if ($application !== null) {
-                    $acParameters = $application->getAllApplicationComponentParameters();
-                    foreach ($acParameters as $parameters) {
-                        extract($parameters);
-                    }
-                }
-                extract($this->parameters);
-                include($templatePath);
-                return ob_get_contents();
-            } else {
-                if ($template !== null) { // If template is null, its a application component, which doesnt have a template
-                    throw new \Exception('Couldnt find template ' . $templatePath);
-                }
-            }
-        }
+		/**
+		 * Decoupled render method, for usage in derived classes
+		 *
+		 * @param string $template
+		 *
+		 * @param bool $obClean
+		 * @param null | Application $application
+		 *
+		 * @return string
+		 * @throws \Exception
+		 */
+		public function renderTemplate($template = '', $obClean = true, $application = null)
+		{
+			$templatePath = $this->getTemplatePath($template, $application);
+			if (realpath($templatePath) !== false) {
+				if ($obClean) {
+					ob_clean();
+				}
+				$this->parameters['request'] = $this->request;
+				if ($application !== null) {
+					$acParameters = $application->getAllApplicationComponentParameters();
+					foreach ($acParameters as $parameters) {
+						extract($parameters);
+					}
+				}
+				extract($this->parameters);
+				include($templatePath);
+				return ob_get_contents();
+			} else {
+				if ($template !== null) { // If template is null, its a application component, which doesnt have a template
+					throw new \Exception('Couldnt find template ' . $templatePath);
+				}
+			}
+		}
 
-        /**
-         * Alias for renderTemplate for usage to include templates in other templates
-         *
-         * @param string $template
-         *
-         * @param array $parameters
-         *
-         * @return string
-         * @throws \Exception
-         */
-        public function includeTemplate($template = '', $parameters = array())
-        {
-            if (is_array($parameters)) {
-                foreach ($parameters as $name => $value) {
-                    $this->parameters[$name] = $value;
-                }
-            }
-            return $this->renderTemplate($template, false);
-        }
+		/**
+		 * Alias for renderTemplate for usage to include templates in other templates
+		 *
+		 * @param string $template
+		 *
+		 * @param array $parameters
+		 *
+		 * @return string
+		 * @throws \Exception
+		 */
+		public function includeTemplate($template = '', $parameters = array())
+		{
+			if (is_array($parameters)) {
+				foreach ($parameters as $name => $value) {
+					$this->parameters[$name] = $value;
+				}
+			}
+			return $this->renderTemplate($template, false);
+		}
 
-        public function getParameters()
-        {
-            return $this->parameters;
-        }
+		public function getParameters()
+		{
+			return $this->parameters;
+		}
 
-        /**
-         * @param $template
-         * @param null | Application $application
-         * @return string
-         */
-        protected function getTemplateDir($template, $application = null)
-        {
-            $templatePath = '';
-            if ($application !== null) {
-                $templatePath = $application->getTemplateDir();
-            }
-            $templatePath = $templatePath . $template . '.php';
-            return $templatePath;
-        }
+		/**
+		 * @param $template
+		 * @param null | Application $application
+		 * @return string
+		 */
+		protected function getTemplateDir($template, $application = null)
+		{
+			$templatePath = '';
+			if ($application !== null) {
+				$templatePath = $application->getTemplateDir();
+			}
+			$templatePath = $templatePath . $template . '.php';
+			return $templatePath;
+		}
 
-        /**
-         * @param $template
-         * @param $application
-         * @return string
-         */
-        private function getTemplatePath($template, $application)
-        {
-            $templateDir = $this->getTemplateDir($template, $application);
-            if ($application !== null) {
-                $rootDir = $application->getRootDir();
-                if (strpos($templateDir, $rootDir) === false) {
-                    $templatePath = $rootDir . DIRECTORY_SEPARATOR . $templateDir;
-                } else {
-                    $templatePath = $templateDir;
-                }
-            } else {
-                $templatePath = $templateDir;
-            }
-            return $templatePath;
-        }
-    }
+		/**
+		 * @param $template
+		 * @param $application
+		 * @return string
+		 */
+		private function getTemplatePath($template, $application)
+		{
+			$templateDir = $this->getTemplateDir($template, $application);
+			if ($application !== null) {
+				$rootDir = $application->getRootDir();
+				if (strpos($templateDir, $rootDir) === false) {
+					$templatePath = $rootDir . DIRECTORY_SEPARATOR . $templateDir;
+				} else {
+					$templatePath = $templateDir;
+				}
+			} else {
+				$templatePath = $templateDir;
+			}
+			return $templatePath;
+		}
+	}
 }
\ No newline at end of file

Spacing +4 added lines, -4 removed lines

@@ -45,7 +45,7 @@ 
         {
             $this->template = $template;
             $this->request = $request;
-            $this->parameters = (array)$parameters;
+            $this->parameters = (array) $parameters;
             $this->matchedSitemapItem = $matchedSitemapItem;
         }
 
@@ -111,7 +111,7 @@ 
                 return ob_get_contents();
             } else {
                 if ($template !== null) { // If template is null, its a application component, which doesnt have a template
-                    throw new \Exception('Couldnt find template ' . $templatePath);
+                    throw new \Exception('Couldnt find template '.$templatePath);
                 }
             }
         }
@@ -152,7 +152,7 @@ 
             if ($application !== null) {
                 $templatePath = $application->getTemplateDir();
             }
-            $templatePath = $templatePath . $template . '.php';
+            $templatePath = $templatePath.$template.'.php';
             return $templatePath;
         }
 
@@ -167,7 +167,7 @@ 
             if ($application !== null) {
                 $rootDir = $application->getRootDir();
                 if (strpos($templateDir, $rootDir) === false) {
-                    $templatePath = $rootDir . DIRECTORY_SEPARATOR . $templateDir;
+                    $templatePath = $rootDir.DIRECTORY_SEPARATOR.$templateDir;
                 } else {
                     $templatePath = $templateDir;
                 }

src/CloudControl.php

Indentation +208 added lines, -208 removed lines

@@ -11,213 +11,213 @@
 
 class CloudControl
 {
-    public static function run()
-    {
-        new Application();
-    }
-
-    public static function postInstall(Event $event)
-    {
-        $event->getIO()->write("Post install");
-        self::checkInstall($event);
-    }
-
-    public static function postUpdate(Event $event)
-    {
-        $event->getIO()->write("Post update");
-        self::checkInstall($event);
-    }
-
-    /**
-     * @param Event $event
-     */
-    private static function checkInstall(Event $event)
-    {
-        $event->getIO()->write("");
-        $event->getIO()->write("********************************************************");
-        $event->getIO()->write("*** Checking installation of Cloud Control framework ***");
-        $event->getIO()->write("********************************************************");
-        $event->getIO()->write("");
-
-        $vendorDir = $event->getComposer()->getConfig()->get('vendor-dir');
-        $rootDir = realpath($vendorDir . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR);
-
-        $baseConfigTargetPath = $rootDir . DIRECTORY_SEPARATOR . 'config.json';
-        $configObject = self::getConfig($event, $baseConfigTargetPath);
-
-        $configObject->{'vendorDir'} = realpath($vendorDir);
-        $configObject->{'rootDir'} = $rootDir;
-        $configObject->{'templateDir'} = self::createDir($event, $rootDir, 'templates');
-        $configObject->{'storageDir'} = self::createDir($event, $rootDir, $configObject->{'storageDir'});
-        $configObject->{'publicDir'} = self::createDir($event, $rootDir, 'public');
-        $configObject->{'jsDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'js');
-        $configObject->{'cssDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'css');
-        $configObject->{'imagesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'images');
-        $configObject->{'filesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'files');
-
-        $baseStorageDefaultPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.json';
-        $baseStorageSqlPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.sql';
-
-        self::createStorage($configObject->{'storageDir'}, $baseStorageDefaultPath, $baseStorageSqlPath);
-        self::saveConfig($event, $baseConfigTargetPath, $configObject);
-        self::copyInstallFile($event, 'public.htaccess', $configObject->{'publicDir'}, '.htaccess');
-        self::copyInstallFile($event, 'root.htaccess', $configObject->{'rootDir'}, '.htaccess');
-        self::copyInstallFile($event, 'base.php', $configObject->{'templateDir'});
-        self::copyInstallFile($event, 'cms.css', $configObject->{'cssDir'});
-        self::copyInstallFile($event, 'cms.js', $configObject->{'jsDir'});
-        self::copyInstallFile($event, 'index.php', $configObject->{'publicDir'});
-
-        $event->getIO()->write("");
-        $event->getIO()->write("[SUCCESS] Installation is complete");
-        $event->getIO()->write("");
-    }
-
-    /**
-     * @param Event $event
-     * @param $baseConfigTargetPath
-     * @param $configObject
-     * @internal param $rootDir
-     * @internal param $vendorDir
-     * @internal param $templateDir
-     * @internal param $storageDir
-     * @internal param $baseConfigDefaultPath
-     * @internal param $baseConfigTargetPath
-     * @internal param $storageDir
-     */
-    private static function saveConfig(Event $event, $baseConfigTargetPath, $configObject)
-    {
-        file_put_contents($baseConfigTargetPath, json_encode($configObject));
-        $event->getIO()->write("[INFO] Saved config to: " . $baseConfigTargetPath);
-    }
-
-    private static function copyInstallFile(Event $event, $sourceFileName, $destinationPath, $destinationFileName = null)
-    {
-        $sourceFilePath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install/_' . $sourceFileName);
-
-
-        if ($destinationFileName === null) {
-            $destinationFileName = $sourceFileName;
-        }
-
-        if (file_exists($sourceFilePath) && realpath($destinationPath) !== false) {
-            $destinationFullPath = realpath($destinationPath) . DIRECTORY_SEPARATOR . $destinationFileName;
-            if (file_exists($destinationFullPath)) {
-                $event->getIO()->write("[INFO] File already exists: " . $destinationFullPath);
-            } else {
-                copy($sourceFilePath, $destinationFullPath);
-                $event->getIO()->write("[INSTALL] Copied file: " . $sourceFileName . ' to ' . $destinationPath);
-            }
-        } else {
-            $event->getIO()->write("[ERROR] Couldnt copy file: " . $sourceFileName . ' to ' . $destinationPath);
-        }
-    }
-
-    /**
-     * @param $storageDir
-     * @param $baseStorageDefaultPath
-     * @param $baseStorageSqlPath
-     */
-    private static function createStorage($storageDir, $baseStorageDefaultPath, $baseStorageSqlPath)
-    {
-        $repository = new Repository($storageDir);
-        $repository->init($baseStorageDefaultPath, $baseStorageSqlPath);
-    }
-
-    private static function createDir(Event $event, $rootDir, $dirName)
-    {
-        $dir = $rootDir . DIRECTORY_SEPARATOR . $dirName . DIRECTORY_SEPARATOR;
-        if (!is_dir($dir)) {
-            mkdir($dir);
-            $event->getIO()->write("[INSTALL] Created dir: " . $dir);
-        } else {
-            $event->getIO()->write("[INFO] Dir already exists: " . $dir);
-        }
-        return self::getRelativePath($rootDir, $dir);
-    }
-
-    /**
-     * @param $configTargetPath
-     * @return mixed
-     */
-    private static function getConfig(Event $event, $configTargetPath)
-    {
-        $baseConfigDefaultPath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_config.json');
-
-        if (file_exists($configTargetPath)) {
-            $config = json_decode(file_get_contents($configTargetPath));
-            $event->getIO()->write("[INFO] Using existing config");
-        } else {
-            $config = json_decode(file_get_contents($baseConfigDefaultPath));
-            $event->getIO()->write("[INSTALL] Created default config");
-        }
-        return $config;
-    }
-
-    /**
-     * Calculate the relative path from $from to $to
-     * Derived from https://stackoverflow.com/a/2638272/
-     *
-     * @param $from
-     * @param $to
-     * @return string
-     */
-    private static function getRelativePath($from, $to)
-    {
-        // some compatibility fixes for Windows paths
-        $from = is_dir($from) ? rtrim($from, '\/') . DIRECTORY_SEPARATOR : $from;
-        $to = is_dir($to) ? rtrim($to, '\/') . DIRECTORY_SEPARATOR : $to;
-        $from = str_replace('\\', DIRECTORY_SEPARATOR, $from);
-        $to = str_replace('\\', DIRECTORY_SEPARATOR, $to);
-
-        $from = explode(DIRECTORY_SEPARATOR, $from);
-        $to = explode(DIRECTORY_SEPARATOR, $to);
-        $relPath = $to;
-
-        $relPath = self::calculateRelativePath($from, $to, $relPath);
-        $relPath = implode(DIRECTORY_SEPARATOR, $relPath);
-        $relPath = self::removePointerToCurrentDir($relPath);
-        return $relPath;
-    }
-
-    /**
-     * @param $relPath
-     * @return mixed
-     */
-    private static function removePointerToCurrentDir($relPath)
-    {
-        while (strpos($relPath, '.' . DIRECTORY_SEPARATOR . '.' . DIRECTORY_SEPARATOR) !== false) {
-            $relPath = str_replace('.' . DIRECTORY_SEPARATOR . '.' . DIRECTORY_SEPARATOR, '.' . DIRECTORY_SEPARATOR, $relPath);
-        }
-        return $relPath;
-    }
-
-    /**
-     * @param $from
-     * @param $to
-     * @param $relPath
-     * @return array
-     */
-    private static function calculateRelativePath($from, $to, $relPath)
-    {
-        foreach ($from as $depth => $dir) {
-            // find first non-matching dir
-            if ($dir === $to[$depth]) {
-                // ignore this directory
-                array_shift($relPath);
-            } else {
-                // get number of remaining dirs to $from
-                $remaining = count($from) - $depth;
-                if ($remaining > 1) {
-                    // add traversals up to first matching dir
-                    $padLength = (count($relPath) + $remaining - 1) * -1;
-                    $relPath = array_pad($relPath, $padLength, '..');
-                    break;
-                } else {
-                    $relPath[0] = '.' . DIRECTORY_SEPARATOR . $relPath[0];
-                }
-            }
-        }
-        return $relPath;
-    }
+	public static function run()
+	{
+		new Application();
+	}
+
+	public static function postInstall(Event $event)
+	{
+		$event->getIO()->write("Post install");
+		self::checkInstall($event);
+	}
+
+	public static function postUpdate(Event $event)
+	{
+		$event->getIO()->write("Post update");
+		self::checkInstall($event);
+	}
+
+	/**
+	 * @param Event $event
+	 */
+	private static function checkInstall(Event $event)
+	{
+		$event->getIO()->write("");
+		$event->getIO()->write("********************************************************");
+		$event->getIO()->write("*** Checking installation of Cloud Control framework ***");
+		$event->getIO()->write("********************************************************");
+		$event->getIO()->write("");
+
+		$vendorDir = $event->getComposer()->getConfig()->get('vendor-dir');
+		$rootDir = realpath($vendorDir . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR);
+
+		$baseConfigTargetPath = $rootDir . DIRECTORY_SEPARATOR . 'config.json';
+		$configObject = self::getConfig($event, $baseConfigTargetPath);
+
+		$configObject->{'vendorDir'} = realpath($vendorDir);
+		$configObject->{'rootDir'} = $rootDir;
+		$configObject->{'templateDir'} = self::createDir($event, $rootDir, 'templates');
+		$configObject->{'storageDir'} = self::createDir($event, $rootDir, $configObject->{'storageDir'});
+		$configObject->{'publicDir'} = self::createDir($event, $rootDir, 'public');
+		$configObject->{'jsDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'js');
+		$configObject->{'cssDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'css');
+		$configObject->{'imagesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'images');
+		$configObject->{'filesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'files');
+
+		$baseStorageDefaultPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.json';
+		$baseStorageSqlPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.sql';
+
+		self::createStorage($configObject->{'storageDir'}, $baseStorageDefaultPath, $baseStorageSqlPath);
+		self::saveConfig($event, $baseConfigTargetPath, $configObject);
+		self::copyInstallFile($event, 'public.htaccess', $configObject->{'publicDir'}, '.htaccess');
+		self::copyInstallFile($event, 'root.htaccess', $configObject->{'rootDir'}, '.htaccess');
+		self::copyInstallFile($event, 'base.php', $configObject->{'templateDir'});
+		self::copyInstallFile($event, 'cms.css', $configObject->{'cssDir'});
+		self::copyInstallFile($event, 'cms.js', $configObject->{'jsDir'});
+		self::copyInstallFile($event, 'index.php', $configObject->{'publicDir'});
+
+		$event->getIO()->write("");
+		$event->getIO()->write("[SUCCESS] Installation is complete");
+		$event->getIO()->write("");
+	}
+
+	/**
+	 * @param Event $event
+	 * @param $baseConfigTargetPath
+	 * @param $configObject
+	 * @internal param $rootDir
+	 * @internal param $vendorDir
+	 * @internal param $templateDir
+	 * @internal param $storageDir
+	 * @internal param $baseConfigDefaultPath
+	 * @internal param $baseConfigTargetPath
+	 * @internal param $storageDir
+	 */
+	private static function saveConfig(Event $event, $baseConfigTargetPath, $configObject)
+	{
+		file_put_contents($baseConfigTargetPath, json_encode($configObject));
+		$event->getIO()->write("[INFO] Saved config to: " . $baseConfigTargetPath);
+	}
+
+	private static function copyInstallFile(Event $event, $sourceFileName, $destinationPath, $destinationFileName = null)
+	{
+		$sourceFilePath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install/_' . $sourceFileName);
+
+
+		if ($destinationFileName === null) {
+			$destinationFileName = $sourceFileName;
+		}
+
+		if (file_exists($sourceFilePath) && realpath($destinationPath) !== false) {
+			$destinationFullPath = realpath($destinationPath) . DIRECTORY_SEPARATOR . $destinationFileName;
+			if (file_exists($destinationFullPath)) {
+				$event->getIO()->write("[INFO] File already exists: " . $destinationFullPath);
+			} else {
+				copy($sourceFilePath, $destinationFullPath);
+				$event->getIO()->write("[INSTALL] Copied file: " . $sourceFileName . ' to ' . $destinationPath);
+			}
+		} else {
+			$event->getIO()->write("[ERROR] Couldnt copy file: " . $sourceFileName . ' to ' . $destinationPath);
+		}
+	}
+
+	/**
+	 * @param $storageDir
+	 * @param $baseStorageDefaultPath
+	 * @param $baseStorageSqlPath
+	 */
+	private static function createStorage($storageDir, $baseStorageDefaultPath, $baseStorageSqlPath)
+	{
+		$repository = new Repository($storageDir);
+		$repository->init($baseStorageDefaultPath, $baseStorageSqlPath);
+	}
+
+	private static function createDir(Event $event, $rootDir, $dirName)
+	{
+		$dir = $rootDir . DIRECTORY_SEPARATOR . $dirName . DIRECTORY_SEPARATOR;
+		if (!is_dir($dir)) {
+			mkdir($dir);
+			$event->getIO()->write("[INSTALL] Created dir: " . $dir);
+		} else {
+			$event->getIO()->write("[INFO] Dir already exists: " . $dir);
+		}
+		return self::getRelativePath($rootDir, $dir);
+	}
+
+	/**
+	 * @param $configTargetPath
+	 * @return mixed
+	 */
+	private static function getConfig(Event $event, $configTargetPath)
+	{
+		$baseConfigDefaultPath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_config.json');
+
+		if (file_exists($configTargetPath)) {
+			$config = json_decode(file_get_contents($configTargetPath));
+			$event->getIO()->write("[INFO] Using existing config");
+		} else {
+			$config = json_decode(file_get_contents($baseConfigDefaultPath));
+			$event->getIO()->write("[INSTALL] Created default config");
+		}
+		return $config;
+	}
+
+	/**
+	 * Calculate the relative path from $from to $to
+	 * Derived from https://stackoverflow.com/a/2638272/
+	 *
+	 * @param $from
+	 * @param $to
+	 * @return string
+	 */
+	private static function getRelativePath($from, $to)
+	{
+		// some compatibility fixes for Windows paths
+		$from = is_dir($from) ? rtrim($from, '\/') . DIRECTORY_SEPARATOR : $from;
+		$to = is_dir($to) ? rtrim($to, '\/') . DIRECTORY_SEPARATOR : $to;
+		$from = str_replace('\\', DIRECTORY_SEPARATOR, $from);
+		$to = str_replace('\\', DIRECTORY_SEPARATOR, $to);
+
+		$from = explode(DIRECTORY_SEPARATOR, $from);
+		$to = explode(DIRECTORY_SEPARATOR, $to);
+		$relPath = $to;
+
+		$relPath = self::calculateRelativePath($from, $to, $relPath);
+		$relPath = implode(DIRECTORY_SEPARATOR, $relPath);
+		$relPath = self::removePointerToCurrentDir($relPath);
+		return $relPath;
+	}
+
+	/**
+	 * @param $relPath
+	 * @return mixed
+	 */
+	private static function removePointerToCurrentDir($relPath)
+	{
+		while (strpos($relPath, '.' . DIRECTORY_SEPARATOR . '.' . DIRECTORY_SEPARATOR) !== false) {
+			$relPath = str_replace('.' . DIRECTORY_SEPARATOR . '.' . DIRECTORY_SEPARATOR, '.' . DIRECTORY_SEPARATOR, $relPath);
+		}
+		return $relPath;
+	}
+
+	/**
+	 * @param $from
+	 * @param $to
+	 * @param $relPath
+	 * @return array
+	 */
+	private static function calculateRelativePath($from, $to, $relPath)
+	{
+		foreach ($from as $depth => $dir) {
+			// find first non-matching dir
+			if ($dir === $to[$depth]) {
+				// ignore this directory
+				array_shift($relPath);
+			} else {
+				// get number of remaining dirs to $from
+				$remaining = count($from) - $depth;
+				if ($remaining > 1) {
+					// add traversals up to first matching dir
+					$padLength = (count($relPath) + $remaining - 1) * -1;
+					$relPath = array_pad($relPath, $padLength, '..');
+					break;
+				} else {
+					$relPath[0] = '.' . DIRECTORY_SEPARATOR . $relPath[0];
+				}
+			}
+		}
+		return $relPath;
+	}
 
 }
\ No newline at end of file

Spacing +23 added lines, -23 removed lines

@@ -40,9 +40,9 @@ 
         $event->getIO()->write("");
 
         $vendorDir = $event->getComposer()->getConfig()->get('vendor-dir');
-        $rootDir = realpath($vendorDir . DIRECTORY_SEPARATOR . '..' . DIRECTORY_SEPARATOR);
+        $rootDir = realpath($vendorDir.DIRECTORY_SEPARATOR.'..'.DIRECTORY_SEPARATOR);
 
-        $baseConfigTargetPath = $rootDir . DIRECTORY_SEPARATOR . 'config.json';
+        $baseConfigTargetPath = $rootDir.DIRECTORY_SEPARATOR.'config.json';
         $configObject = self::getConfig($event, $baseConfigTargetPath);
 
         $configObject->{'vendorDir'} = realpath($vendorDir);
@@ -50,13 +50,13 @@ 
         $configObject->{'templateDir'} = self::createDir($event, $rootDir, 'templates');
         $configObject->{'storageDir'} = self::createDir($event, $rootDir, $configObject->{'storageDir'});
         $configObject->{'publicDir'} = self::createDir($event, $rootDir, 'public');
-        $configObject->{'jsDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'js');
-        $configObject->{'cssDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'css');
-        $configObject->{'imagesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'images');
-        $configObject->{'filesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'} . 'files');
+        $configObject->{'jsDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'}.'js');
+        $configObject->{'cssDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'}.'css');
+        $configObject->{'imagesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'}.'images');
+        $configObject->{'filesDir'} = self::createDir($event, $rootDir, $configObject->{'publicDir'}.'files');
 
-        $baseStorageDefaultPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.json';
-        $baseStorageSqlPath = __DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_storage.sql';
+        $baseStorageDefaultPath = __DIR__.DIRECTORY_SEPARATOR.'install'.DIRECTORY_SEPARATOR.'_storage.json';
+        $baseStorageSqlPath = __DIR__.DIRECTORY_SEPARATOR.'install'.DIRECTORY_SEPARATOR.'_storage.sql';
 
         self::createStorage($configObject->{'storageDir'}, $baseStorageDefaultPath, $baseStorageSqlPath);
         self::saveConfig($event, $baseConfigTargetPath, $configObject);
@@ -87,12 +87,12 @@ 
     private static function saveConfig(Event $event, $baseConfigTargetPath, $configObject)
     {
         file_put_contents($baseConfigTargetPath, json_encode($configObject));
-        $event->getIO()->write("[INFO] Saved config to: " . $baseConfigTargetPath);
+        $event->getIO()->write("[INFO] Saved config to: ".$baseConfigTargetPath);
     }
 
     private static function copyInstallFile(Event $event, $sourceFileName, $destinationPath, $destinationFileName = null)
     {
-        $sourceFilePath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install/_' . $sourceFileName);
+        $sourceFilePath = realpath(__DIR__.DIRECTORY_SEPARATOR.'install/_'.$sourceFileName);
 
 
         if ($destinationFileName === null) {
@@ -100,15 +100,15 @@ 
         }
 
         if (file_exists($sourceFilePath) && realpath($destinationPath) !== false) {
-            $destinationFullPath = realpath($destinationPath) . DIRECTORY_SEPARATOR . $destinationFileName;
+            $destinationFullPath = realpath($destinationPath).DIRECTORY_SEPARATOR.$destinationFileName;
             if (file_exists($destinationFullPath)) {
-                $event->getIO()->write("[INFO] File already exists: " . $destinationFullPath);
+                $event->getIO()->write("[INFO] File already exists: ".$destinationFullPath);
             } else {
                 copy($sourceFilePath, $destinationFullPath);
-                $event->getIO()->write("[INSTALL] Copied file: " . $sourceFileName . ' to ' . $destinationPath);
+                $event->getIO()->write("[INSTALL] Copied file: ".$sourceFileName.' to '.$destinationPath);
             }
         } else {
-            $event->getIO()->write("[ERROR] Couldnt copy file: " . $sourceFileName . ' to ' . $destinationPath);
+            $event->getIO()->write("[ERROR] Couldnt copy file: ".$sourceFileName.' to '.$destinationPath);
         }
     }
 
@@ -125,12 +125,12 @@ 
 
     private static function createDir(Event $event, $rootDir, $dirName)
     {
-        $dir = $rootDir . DIRECTORY_SEPARATOR . $dirName . DIRECTORY_SEPARATOR;
+        $dir = $rootDir.DIRECTORY_SEPARATOR.$dirName.DIRECTORY_SEPARATOR;
         if (!is_dir($dir)) {
             mkdir($dir);
-            $event->getIO()->write("[INSTALL] Created dir: " . $dir);
+            $event->getIO()->write("[INSTALL] Created dir: ".$dir);
         } else {
-            $event->getIO()->write("[INFO] Dir already exists: " . $dir);
+            $event->getIO()->write("[INFO] Dir already exists: ".$dir);
         }
         return self::getRelativePath($rootDir, $dir);
     }
@@ -141,7 +141,7 @@ 
      */
     private static function getConfig(Event $event, $configTargetPath)
     {
-        $baseConfigDefaultPath = realpath(__DIR__ . DIRECTORY_SEPARATOR . 'install' . DIRECTORY_SEPARATOR . '_config.json');
+        $baseConfigDefaultPath = realpath(__DIR__.DIRECTORY_SEPARATOR.'install'.DIRECTORY_SEPARATOR.'_config.json');
 
         if (file_exists($configTargetPath)) {
             $config = json_decode(file_get_contents($configTargetPath));
@@ -164,8 +164,8 @@ 
     private static function getRelativePath($from, $to)
     {
         // some compatibility fixes for Windows paths
-        $from = is_dir($from) ? rtrim($from, '\/') . DIRECTORY_SEPARATOR : $from;
-        $to = is_dir($to) ? rtrim($to, '\/') . DIRECTORY_SEPARATOR : $to;
+        $from = is_dir($from) ? rtrim($from, '\/').DIRECTORY_SEPARATOR : $from;
+        $to = is_dir($to) ? rtrim($to, '\/').DIRECTORY_SEPARATOR : $to;
         $from = str_replace('\\', DIRECTORY_SEPARATOR, $from);
         $to = str_replace('\\', DIRECTORY_SEPARATOR, $to);
 
@@ -185,8 +185,8 @@ 
      */
     private static function removePointerToCurrentDir($relPath)
     {
-        while (strpos($relPath, '.' . DIRECTORY_SEPARATOR . '.' . DIRECTORY_SEPARATOR) !== false) {
-            $relPath = str_replace('.' . DIRECTORY_SEPARATOR . '.' . DIRECTORY_SEPARATOR, '.' . DIRECTORY_SEPARATOR, $relPath);
+        while (strpos($relPath, '.'.DIRECTORY_SEPARATOR.'.'.DIRECTORY_SEPARATOR) !== false) {
+            $relPath = str_replace('.'.DIRECTORY_SEPARATOR.'.'.DIRECTORY_SEPARATOR, '.'.DIRECTORY_SEPARATOR, $relPath);
         }
         return $relPath;
     }
@@ -213,7 +213,7 @@ 
                     $relPath = array_pad($relPath, $padLength, '..');
                     break;
                 } else {
-                    $relPath[0] = '.' . DIRECTORY_SEPARATOR . $relPath[0];
+                    $relPath[0] = '.'.DIRECTORY_SEPARATOR.$relPath[0];
                 }
             }
         }

src/util/functions.php

Indentation +44 added lines, -44 removed lines

@@ -9,15 +9,15 @@ 
  */
 function dump()
 {
-    $debug_backtrace = current(debug_backtrace());
-    if (PHP_SAPI == 'cli') {
-        echo 'Dump: ' . $debug_backtrace['file'] . ':' . $debug_backtrace['line'] . "\n";
-        foreach (func_get_args() as $data) {
-            var_dump($data);
-        }
-    } else {
-        ob_clean();
-        echo <<<END
+	$debug_backtrace = current(debug_backtrace());
+	if (PHP_SAPI == 'cli') {
+		echo 'Dump: ' . $debug_backtrace['file'] . ':' . $debug_backtrace['line'] . "\n";
+		foreach (func_get_args() as $data) {
+			var_dump($data);
+		}
+	} else {
+		ob_clean();
+		echo <<<END
 <!DOCTYPE html>
 <html>
 <head>
@@ -29,20 +29,20 @@ 
 <body>
 END;
 
-        echo '<div>Dump: ' . $debug_backtrace['file'] . ':<b>' . $debug_backtrace['line'] . "</b></div>";
-        echo '<pre>';
-        foreach (func_get_args() as $data) {
-            echo "<code>";
-            var_dump($data);
-            echo "</code>";
-        }
-        echo '</pre>';
-        echo <<<END
+		echo '<div>Dump: ' . $debug_backtrace['file'] . ':<b>' . $debug_backtrace['line'] . "</b></div>";
+		echo '<pre>';
+		foreach (func_get_args() as $data) {
+			echo "<code>";
+			var_dump($data);
+			echo "</code>";
+		}
+		echo '</pre>';
+		echo <<<END
 </body>
 </html>
 END;
-    }
-    die;
+	}
+	die;
 }
 
 /**
@@ -53,27 +53,27 @@ 
  */
 function sanitize_output($buffer)
 {
-    if (!isset($_GET['unsanitized'])) {
-        $search = array(
-            '/\>[^\S ]+/s',     // strip whitespaces after tags, except space
-            '/[^\S ]+\</s',     // strip whitespaces before tags, except space
-            '/(\s)+/s',         // shorten multiple whitespace sequences
-            '/<!--(.|\s)*?-->/' // Remove HTML comments
-        );
+	if (!isset($_GET['unsanitized'])) {
+		$search = array(
+			'/\>[^\S ]+/s',     // strip whitespaces after tags, except space
+			'/[^\S ]+\</s',     // strip whitespaces before tags, except space
+			'/(\s)+/s',         // shorten multiple whitespace sequences
+			'/<!--(.|\s)*?-->/' // Remove HTML comments
+		);
 
-        $replace = array(
-            '>',
-            '<',
-            '\\1',
-            ''
-        );
+		$replace = array(
+			'>',
+			'<',
+			'\\1',
+			''
+		);
 
-        $buffer = preg_replace($search, $replace, $buffer);
+		$buffer = preg_replace($search, $replace, $buffer);
 
-        return $buffer;
-    } else {
-        return $buffer;
-    }
+		return $buffer;
+	} else {
+		return $buffer;
+	}
 }
 
 
@@ -85,11 +85,11 @@ 
  */
 function utf8Convert($array)
 {
-    array_walk_recursive($array, function (&$item) {
-        if (!mb_detect_encoding($item, 'utf-8', true)) {
-            $item = utf8_encode($item);
-        }
-    });
+	array_walk_recursive($array, function (&$item) {
+		if (!mb_detect_encoding($item, 'utf-8', true)) {
+			$item = utf8_encode($item);
+		}
+	});
 
-    return $array;
+	return $array;
 }
\ No newline at end of file

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
 {
     $debug_backtrace = current(debug_backtrace());
     if (PHP_SAPI == 'cli') {
-        echo 'Dump: ' . $debug_backtrace['file'] . ':' . $debug_backtrace['line'] . "\n";
+        echo 'Dump: '.$debug_backtrace['file'].':'.$debug_backtrace['line']."\n";
         foreach (func_get_args() as $data) {
             var_dump($data);
         }
@@ -29,7 +29,7 @@ 
 <body>
 END;
 
-        echo '<div>Dump: ' . $debug_backtrace['file'] . ':<b>' . $debug_backtrace['line'] . "</b></div>";
+        echo '<div>Dump: '.$debug_backtrace['file'].':<b>'.$debug_backtrace['line']."</b></div>";
         echo '<pre>';
         foreach (func_get_args() as $data) {
             echo "<code>";
@@ -55,9 +55,9 @@ 
 {
     if (!isset($_GET['unsanitized'])) {
         $search = array(
-            '/\>[^\S ]+/s',     // strip whitespaces after tags, except space
-            '/[^\S ]+\</s',     // strip whitespaces before tags, except space
-            '/(\s)+/s',         // shorten multiple whitespace sequences
+            '/\>[^\S ]+/s', // strip whitespaces after tags, except space
+            '/[^\S ]+\</s', // strip whitespaces before tags, except space
+            '/(\s)+/s', // shorten multiple whitespace sequences
             '/<!--(.|\s)*?-->/' // Remove HTML comments
         );
 
@@ -85,7 +85,7 @@ 
  */
 function utf8Convert($array)
 {
-    array_walk_recursive($array, function (&$item) {
+    array_walk_recursive($array, function(&$item) {
         if (!mb_detect_encoding($item, 'utf-8', true)) {
             $item = utf8_encode($item);
         }