diff --git a/.idea/Php_RSS.iml b/.idea/Php_RSS.iml old mode 100644 new mode 100755 index 8f8b6ed..606a380 --- a/.idea/Php_RSS.iml +++ b/.idea/Php_RSS.iml @@ -2,10 +2,22 @@ + + + + + + + + + + + + diff --git a/.idea/modules.xml b/.idea/modules.xml old mode 100644 new mode 100755 diff --git a/.idea/php.xml b/.idea/php.xml old mode 100644 new mode 100755 index 956337a..682b1d6 --- a/.idea/php.xml +++ b/.idea/php.xml @@ -1,14 +1,34 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/sqldialects.xml b/.idea/sqldialects.xml new file mode 100755 index 0000000..ff83d34 --- /dev/null +++ b/.idea/sqldialects.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml old mode 100644 new mode 100755 diff --git a/mvc_PSR4_twig/.DS_Store b/fluxRSS/.DS_Store similarity index 100% rename from mvc_PSR4_twig/.DS_Store rename to fluxRSS/.DS_Store diff --git a/fluxRSS/.htaccess b/fluxRSS/.htaccess new file mode 100755 index 0000000..7ded04e --- /dev/null +++ b/fluxRSS/.htaccess @@ -0,0 +1,3 @@ +RewriteEngine on +RewriteCond %{REQUEST_FILENAME} !-f +RewriteRule . index.php [L] \ No newline at end of file diff --git a/fluxRSS/.idea/.gitignore b/fluxRSS/.idea/.gitignore new file mode 100755 index 0000000..13566b8 --- /dev/null +++ b/fluxRSS/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/fluxRSS/.idea/modules.xml b/fluxRSS/.idea/modules.xml new file mode 100755 index 0000000..9a41ff4 --- /dev/null +++ b/fluxRSS/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/fluxRSS/.idea/mvc_PSR4_twig.iml b/fluxRSS/.idea/mvc_PSR4_twig.iml new file mode 100755 index 0000000..e520f52 --- /dev/null +++ b/fluxRSS/.idea/mvc_PSR4_twig.iml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/fluxRSS/.idea/php.xml b/fluxRSS/.idea/php.xml new file mode 100755 index 0000000..389b084 --- /dev/null +++ b/fluxRSS/.idea/php.xml @@ -0,0 +1,14 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/fluxRSS/.idea/vcs.xml b/fluxRSS/.idea/vcs.xml new file mode 100755 index 0000000..6c0b863 --- /dev/null +++ b/fluxRSS/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/fluxRSS/AltoRouter.php b/fluxRSS/AltoRouter.php new file mode 100755 index 0000000..6c14b90 --- /dev/null +++ b/fluxRSS/AltoRouter.php @@ -0,0 +1,304 @@ + + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +namespace vendor; + +class AltoRouter +{ + + /** + * @var array Array of all routes (incl. named routes). + */ + protected $routes = []; + + /** + * @var array Array of all named routes. + */ + protected $namedRoutes = []; + + /** + * @var string Can be used to ignore leading part of the Request URL (if main file lives in subdirectory of host) + */ + protected $basePath = ''; + + /** + * @var array Array of default match types (regex helpers) + */ + protected $matchTypes = [ + 'i' => '[0-9]++', + 'a' => '[0-9A-Za-z]++', + 'h' => '[0-9A-Fa-f]++', + '*' => '.+?', + '**' => '.++', + '' => '[^/\.]++' + ]; + + /** + * Create router in one call from config. + * + * @param array $routes + * @param string $basePath + * @param array $matchTypes + * @throws Exception + */ + public function __construct(array $routes = [], $basePath = '', array $matchTypes = []) + { + $this->addRoutes($routes); + $this->setBasePath($basePath); + $this->addMatchTypes($matchTypes); + } + + /** + * Retrieves all routes. + * Useful if you want to process or display routes. + * @return array All routes. + */ + public function getRoutes() + { + return $this->routes; + } + + /** + * Add multiple routes at once from array in the following format: + * + * $routes = [ + * [$method, $route, $target, $name] + * ]; + * + * @param array $routes + * @return void + * @author Koen Punt + * @throws Exception + */ + public function addRoutes($routes) + { + if (!is_array($routes) && !$routes instanceof Traversable) { + throw new RuntimeException('Routes should be an array or an instance of Traversable'); + } + foreach ($routes as $route) { + call_user_func_array([$this, 'map'], $route); + } + } + + /** + * Set the base path. + * Useful if you are running your application from a subdirectory. + * @param string $basePath + */ + public function setBasePath($basePath) + { + $this->basePath = $basePath; + } + + /** + * Add named match types. It uses array_merge so keys can be overwritten. + * + * @param array $matchTypes The key is the name and the value is the regex. + */ + public function addMatchTypes(array $matchTypes) + { + $this->matchTypes = array_merge($this->matchTypes, $matchTypes); + } + + /** + * Map a route to a target + * + * @param string $method One of 5 HTTP Methods, or a pipe-separated list of multiple HTTP Methods (GET|POST|PATCH|PUT|DELETE) + * @param string $route The route regex, custom regex must start with an @. You can use multiple pre-set regex filters, like [i:id] + * @param mixed $target The target where this route should point to. Can be anything. + * @param string $name Optional name of this route. Supply if you want to reverse route this url in your application. + * @throws Exception + */ + public function map($method, $route, $target, $name = null) + { + + $this->routes[] = [$method, $route, $target, $name]; + + if ($name) { + if (isset($this->namedRoutes[$name])) { + throw new RuntimeException("Can not redeclare route '{$name}'"); + } + $this->namedRoutes[$name] = $route; + } + + return; + } + + /** + * Reversed routing + * + * Generate the URL for a named route. Replace regexes with supplied parameters + * + * @param string $routeName The name of the route. + * @param array @params Associative array of parameters to replace placeholders with. + * @return string The URL of the route with named parameters in place. + * @throws Exception + */ + public function generate($routeName, array $params = []) + { + + // Check if named route exists + if (!isset($this->namedRoutes[$routeName])) { + throw new RuntimeException("Route '{$routeName}' does not exist."); + } + + // Replace named parameters + $route = $this->namedRoutes[$routeName]; + + // prepend base path to route url again + $url = $this->basePath . $route; + + if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) { + foreach ($matches as $index => $match) { + list($block, $pre, $type, $param, $optional) = $match; + + if ($pre) { + $block = substr($block, 1); + } + + if (isset($params[$param])) { + // Part is found, replace for param value + $url = str_replace($block, $params[$param], $url); + } elseif ($optional && $index !== 0) { + // Only strip preceding slash if it's not at the base + $url = str_replace($pre . $block, '', $url); + } else { + // Strip match block + $url = str_replace($block, '', $url); + } + } + } + + return $url; + } + + /** + * Match a given Request Url against stored routes + * @param string $requestUrl + * @param string $requestMethod + * @return array|boolean Array with route information on success, false on failure (no match). + */ + public function match($requestUrl = null, $requestMethod = null) + { + + $params = []; + + // set Request Url if it isn't passed as parameter + if ($requestUrl === null) { + $requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/'; + } + + // strip base path from request url + $requestUrl = substr($requestUrl, strlen($this->basePath)); + + // Strip query string (?a=b) from Request Url + if (($strpos = strpos($requestUrl, '?')) !== false) { + $requestUrl = substr($requestUrl, 0, $strpos); + } + + $lastRequestUrlChar = $requestUrl ? $requestUrl[strlen($requestUrl)-1] : ''; + + // set Request Method if it isn't passed as a parameter + if ($requestMethod === null) { + $requestMethod = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'GET'; + } + + foreach ($this->routes as $handler) { + list($methods, $route, $target, $name) = $handler; + + $method_match = (stripos($methods, $requestMethod) !== false); + + // Method did not match, continue to next route. + if (!$method_match) { + continue; + } + + if ($route === '*') { + // * wildcard (matches all) + $match = true; + } elseif (isset($route[0]) && $route[0] === '@') { + // @ regex delimiter + $pattern = '`' . substr($route, 1) . '`u'; + $match = preg_match($pattern, $requestUrl, $params) === 1; + } elseif (($position = strpos($route, '[')) === false) { + // No params in url, do string comparison + $match = strcmp($requestUrl, $route) === 0; + } else { + // Compare longest non-param string with url before moving on to regex + // Check if last character before param is a slash, because it could be optional if param is optional too (see https://github.com/dannyvankooten/AltoRouter/issues/241) + if (strncmp($requestUrl, $route, $position) !== 0 && ($lastRequestUrlChar === '/' || $route[$position-1] !== '/')) { + continue; + } + + $regex = $this->compileRoute($route); + $match = preg_match($regex, $requestUrl, $params) === 1; + } + + if ($match) { + if ($params) { + foreach ($params as $key => $value) { + if (is_numeric($key)) { + unset($params[$key]); + } + } + } + + return [ + 'target' => $target, + 'params' => $params, + 'name' => $name + ]; + } + } + + return false; + } + + /** + * Compile the regex for a given route (EXPENSIVE) + * @param $route + * @return string + */ + protected function compileRoute($route) + { + if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) { + $matchTypes = $this->matchTypes; + foreach ($matches as $match) { + list($block, $pre, $type, $param, $optional) = $match; + + if (isset($matchTypes[$type])) { + $type = $matchTypes[$type]; + } + if ($pre === '.') { + $pre = '\.'; + } + + $optional = $optional !== '' ? '?' : null; + + //Older versions of PCRE require the 'P' in (?P) + $pattern = '(?:' + . ($pre !== '' ? $pre : null) + . '(' + . ($param !== '' ? "?P<$param>" : null) + . $type + . ')' + . $optional + . ')' + . $optional; + + $route = str_replace($block, $pattern, $route); + } + } + return "`^$route$`u"; + } +} diff --git a/fluxRSS/DAL/AdminGateway.php b/fluxRSS/DAL/AdminGateway.php new file mode 100755 index 0000000..16e6ab3 --- /dev/null +++ b/fluxRSS/DAL/AdminGateway.php @@ -0,0 +1,29 @@ +con = $con; + } + + public function login(string $login):array + { + try{ + $query = 'SELECT password,mail FROM Admin WHERE name = :login;'; + $this->con->executeQuery($query, array(':login' => array($login, PDO::PARAM_STR))); + return $this->con->getResults(); + }catch (\PDOException $e){ + throw new \Exception("PDO error"); + } + } +} \ No newline at end of file diff --git a/fluxRSS/DAL/ArticleGateway.php b/fluxRSS/DAL/ArticleGateway.php new file mode 100755 index 0000000..89e43ec --- /dev/null +++ b/fluxRSS/DAL/ArticleGateway.php @@ -0,0 +1,60 @@ +con = $con; + } + + /** + * @throws Exception + */ + public function getAllArticles():array + { + try { + $query = 'SELECT * FROM Article;'; + $this->con->executeQuery($query, array()); + return $this->con->getResults(); + }catch (\PDOException $e){ + throw new Exception("PDO error"); + } + } + + /** + * @throws Exception + */ + public function addArticle(Article $article){ + try { + $query = 'INSERT INTO Article VALUES (:id,:title,to_date(:date,"Dy, DD Mon YYYY"),:description,:guid,:link,:mediaContent,:provenance);'; + $this->con->executeQuery($query, array(':id' => array($article->getId(), PDO::PARAM_STR), + ':title' => array($article->getTitle(), PDO::PARAM_STR), + ':date' => array($article->getDate(), PDO::PARAM_STR), + ':description' => array($article->getDescription(), PDO::PARAM_STR), + ':guid' => array($article->getGuid(), PDO::PARAM_STR), + ':link' => array($article->getLink(), PDO::PARAM_STR), + ':mediaContent' => array($article->getMediaContent(), PDO::PARAM_STR), + ':provenance' => array($article->getProvenance(), PDO::PARAM_INT))); + }catch (\PDOException $e){ + throw new Exception("PDO error"); + } + } + + public function removeAllArticleForParser(){ + try{ + $query = 'DELETE FROM Article;'; + $this->con->executeQuery($query); + }catch(\PDOException $p){ + throw new Exception("Data is not delete."); + } + } +} \ No newline at end of file diff --git a/fluxRSS/DAL/Connection.php b/fluxRSS/DAL/Connection.php new file mode 100755 index 0000000..dc58de2 --- /dev/null +++ b/fluxRSS/DAL/Connection.php @@ -0,0 +1,59 @@ +setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + }catch (\PDOException $e){ + throw new Exception("PDO error con"); + } + catch (Error $e){ + throw new Error("Error PDO"); + } + } + + /** + * @param string $query to execute + * @param array $parameters to bind + * @return bool Returns `true` on success, `false` otherwise + * @throws Exception + */ + public function executeQuery(string $query, array $parameters = []): bool + { + try{ + $this->stmt = parent::prepare($query); + foreach ($parameters as $name => $value) { + $this->stmt->bindValue($name, $value[0], $value[1]); + } + + return $this->stmt->execute(); + }catch (\PDOException $e){ + throw new Exception("PDO error"); + } + } + + /** + * @return array + */ + public function getResults(): array + { + return $this->stmt->fetchall(); + } +} \ No newline at end of file diff --git a/fluxRSS/DAL/FluxGateway.php b/fluxRSS/DAL/FluxGateway.php new file mode 100755 index 0000000..43bbe9f --- /dev/null +++ b/fluxRSS/DAL/FluxGateway.php @@ -0,0 +1,57 @@ +con = $con; + } + + public function addFlux($flux){ + try{ + $query = 'INSERT INTO Flux VALUES (:flux);'; + $this->con->executeQuery($query, array(':flux' => array($flux->getFlux(), PDO::PARAM_STR))); + }catch (\PDOException $e){ + throw new \Exception("PDO error"); + } + } + + public function removeFlux($flux){ + try{ + $query = 'DELETE FROM Flux WHERE flux = :flux;'; + $this->con->executeQuery($query, array(':flux' => array($flux->getFlux(), PDO::PARAM_STR))); + }catch (\PDOException $e){ + throw new \Exception("PDO error"); + } + } + + public function findAllFlux(){ + try{ + $query = 'SELECT * FROM Flux;'; + $this->con->executeQuery($query); + return $this->con->getResults(); + }catch (\PDOException $e){ + throw new \Exception("PDO error"); + } + } + + public function findFlux(Flux $flux){ + return $this->findFluxBySrc($flux->getFlux()); + } + + public function findFluxBySrc(string $flux){ + try{ + $query = 'SELECT * FROM Flux WHERE flux = :flux;'; + $this->con->executeQuery($query, array(':flux' => array($flux, PDO::PARAM_STR))); + return $this->con->getResults(); + }catch (\PDOException $e){ + throw new \Exception("PDO error"); + } + } +} \ No newline at end of file diff --git a/mvc_PSR4_twig/cache/7d/7d23d818a9618a39f1bf95b3e694ad5c44a32007fb7602bc4dc5cebe7a55ad13.php b/fluxRSS/cache/7d/7d23d818a9618a39f1bf95b3e694ad5c44a32007fb7602bc4dc5cebe7a55ad13.php similarity index 91% rename from mvc_PSR4_twig/cache/7d/7d23d818a9618a39f1bf95b3e694ad5c44a32007fb7602bc4dc5cebe7a55ad13.php rename to fluxRSS/cache/7d/7d23d818a9618a39f1bf95b3e694ad5c44a32007fb7602bc4dc5cebe7a55ad13.php index 1dcc316..343538b 100755 --- a/mvc_PSR4_twig/cache/7d/7d23d818a9618a39f1bf95b3e694ad5c44a32007fb7602bc4dc5cebe7a55ad13.php +++ b/fluxRSS/cache/7d/7d23d818a9618a39f1bf95b3e694ad5c44a32007fb7602bc4dc5cebe7a55ad13.php @@ -12,7 +12,11 @@ use Twig\Sandbox\SecurityNotAllowedFunctionError; use Twig\Source; use Twig\Template; -/* vuephp1.html */ +<<<<<<< HEAD +/* connexion.html */ +======= +/* Connection.html */ +>>>>>>> pre-master class __TwigTemplate_2ce784f5b9085065b66af58be97997ff169e0f0d71d95a1d280acea4a24fd4e6 extends Template { private $source; @@ -165,7 +169,11 @@ utilisation anormale de la vuephp public function getTemplateName() { - return "vuephp1.html"; +<<<<<<< HEAD + return "connexion.html"; +======= + return "Connection.html"; +>>>>>>> pre-master } public function isTraitable() @@ -180,6 +188,10 @@ utilisation anormale de la vuephp public function getSourceContext() { - return new Source("", "vuephp1.html", "/Applications/MAMP/htdocs/phptwig/templates/vuephp1.html"); +<<<<<<< HEAD + return new Source("", "connexion.html", "/Applications/MAMP/htdocs/phptwig/templates/connexion.html"); +======= + return new Source("", "Connection.html", "/Applications/MAMP/htdocs/phptwig/templates/Connection.html"); +>>>>>>> pre-master } } diff --git a/fluxRSS/composer.json b/fluxRSS/composer.json new file mode 100755 index 0000000..2ef7dc7 --- /dev/null +++ b/fluxRSS/composer.json @@ -0,0 +1,16 @@ +{ + "require": { + "twig/twig": "^3.0", + "ext-pdo": "*", + "ext-dom": "*" + }, + "autoload": { + "psr-4": { + "controleur\\": "controleur/", + "config\\": "config/", + "model\\": "model/", + "DAL\\": "DAL/", + "metier\\": "metier/" + } + } +} diff --git a/fluxRSS/composer.lock b/fluxRSS/composer.lock new file mode 100755 index 0000000..9d8ce02 --- /dev/null +++ b/fluxRSS/composer.lock @@ -0,0 +1,258 @@ +{ + "_readme": [ + "This file locks the dependencies of your project to a known state", + "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", + "This file is @generated automatically" + ], + "content-hash": "03e1f7c6d7574f3683225067dbb2becc", + "packages": [ + { + "name": "symfony/polyfill-ctype", + "version": "v1.28.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-ctype.git", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "reference": "ea208ce43cbb04af6867b4fdddb1bdbf84cc28cb", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-ctype": "*" + }, + "suggest": { + "ext-ctype": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Ctype\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Gert de Pagter", + "email": "BackEndTea@gmail.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for ctype functions", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "ctype", + "polyfill", + "portable" + ], + "support": { + "source": "https://github.com/symfony/polyfill-ctype/tree/v1.28.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-01-26T09:26:14+00:00" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "v1.28.0", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "42292d99c55abe617799667f454222c54c60e229" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/42292d99c55abe617799667f454222c54c60e229", + "reference": "42292d99c55abe617799667f454222c54c60e229", + "shasum": "" + }, + "require": { + "php": ">=7.1" + }, + "provide": { + "ext-mbstring": "*" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-main": "1.28-dev" + }, + "thanks": { + "name": "symfony/polyfill", + "url": "https://github.com/symfony/polyfill" + } + }, + "autoload": { + "files": [ + "bootstrap.php" + ], + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "support": { + "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.28.0" + }, + "funding": [ + { + "url": "https://symfony.com/sponsor", + "type": "custom" + }, + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/symfony/symfony", + "type": "tidelift" + } + ], + "time": "2023-07-28T09:04:16+00:00" + }, + { + "name": "twig/twig", + "version": "v3.7.1", + "source": { + "type": "git", + "url": "https://github.com/twigphp/Twig.git", + "reference": "a0ce373a0ca3bf6c64b9e3e2124aca502ba39554" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/twigphp/Twig/zipball/a0ce373a0ca3bf6c64b9e3e2124aca502ba39554", + "reference": "a0ce373a0ca3bf6c64b9e3e2124aca502ba39554", + "shasum": "" + }, + "require": { + "php": ">=7.2.5", + "symfony/polyfill-ctype": "^1.8", + "symfony/polyfill-mbstring": "^1.3" + }, + "require-dev": { + "psr/container": "^1.0|^2.0", + "symfony/phpunit-bridge": "^5.4.9|^6.3" + }, + "type": "library", + "autoload": { + "psr-4": { + "Twig\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com", + "homepage": "http://fabien.potencier.org", + "role": "Lead Developer" + }, + { + "name": "Twig Team", + "role": "Contributors" + }, + { + "name": "Armin Ronacher", + "email": "armin.ronacher@active-4.com", + "role": "Project Founder" + } + ], + "description": "Twig, the flexible, fast, and secure template language for PHP", + "homepage": "https://twig.symfony.com", + "keywords": [ + "templating" + ], + "support": { + "issues": "https://github.com/twigphp/Twig/issues", + "source": "https://github.com/twigphp/Twig/tree/v3.7.1" + }, + "funding": [ + { + "url": "https://github.com/fabpot", + "type": "github" + }, + { + "url": "https://tidelift.com/funding/github/packagist/twig/twig", + "type": "tidelift" + } + ], + "time": "2023-08-28T11:09:02+00:00" + } + ], + "packages-dev": [], + "aliases": [], + "minimum-stability": "stable", + "stability-flags": [], + "prefer-stable": false, + "prefer-lowest": false, + "platform": { + "ext-pdo": "*", + "ext-dom": "*" + }, + "platform-dev": [], + "plugin-api-version": "2.6.0" +} diff --git a/mvc_PSR4_twig/composer.phar b/fluxRSS/composer.phar similarity index 100% rename from mvc_PSR4_twig/composer.phar rename to fluxRSS/composer.phar diff --git a/mvc_PSR4_twig/config/.DS_Store b/fluxRSS/config/.DS_Store similarity index 100% rename from mvc_PSR4_twig/config/.DS_Store rename to fluxRSS/config/.DS_Store diff --git a/mvc_PSR4_twig/config/Validation.php b/fluxRSS/config/Validation.php similarity index 96% rename from mvc_PSR4_twig/config/Validation.php rename to fluxRSS/config/Validation.php index ba926ca..058290e 100755 --- a/mvc_PSR4_twig/config/Validation.php +++ b/fluxRSS/config/Validation.php @@ -1,34 +1,34 @@ -connection(); + break; + + case 'connection': + $this->connection();; + break; + case 'validationFormulaire': + $this->ValidationFormulaire($dVueEreur); + break; + + case 'listArticle': + $this->listArticle(); + break; + //mauvaise action + default: + $dVueEreur[] = "Erreur d'appel php"; + echo $twig->render('listArticle.html', ['dVueErreur'=>$dVueEreur,'isAdmin' => AdminModel::isAdmin()]); + break; + } + } catch (\PDOException $e) { + //si erreur BD, pas le cas ici + $dVueEreur[] = 'Erreur PDO : ' . $e->getMessage(); + echo $twig->render('erreur.html', ['dVueEreur' => $dVueEreur]); + } catch (\Exception $e2) { + $dVueEreur[] = 'Erreur : ' . $e2->getMessage(); + echo $twig->render('erreur.html', ['dVueEreur' => $dVueEreur]); + } + + //fin + exit(0); + } + + public function listArticle() + { + global $twig; + $articleModel = new ArticleModel(); + $dVue = [ + 'data' => $articleModel->getArticles() + ]; + echo $twig->render('listArticle.html', [ + 'dVue' => $dVue, + 'isAdmin' => AdminModel::isAdmin() + ]); + } + + public function connection(){ + global $twig; // nécessaire pour utiliser variables globales + if (!AdminModel::isAdmin()){ + $this->listArticle(); + } + else { + echo $twig->render('Connection.html'); + if (isset($_POST['username']) && isset($_POST['password'])) { + $this->login(); + } + } + } + + public function login(){ + $username = $_POST['username']; + $password = $_POST['password']; + + $adminModel = new AdminModel(); + $admin = $adminModel->connection($username, $password); + + if ($admin != null) { + $this->listArticle(); + } + else{ + unset($_POST['username']); + unset($_POST['passwords']); + $this->connection(); + } + } +} \ No newline at end of file diff --git a/fluxRSS/controleur/FrontControleur.php b/fluxRSS/controleur/FrontControleur.php new file mode 100755 index 0000000..26b23c9 --- /dev/null +++ b/fluxRSS/controleur/FrontControleur.php @@ -0,0 +1,50 @@ +setBasePath('~mapoint2/SAE/Php_RSS/fluxRSS/'); + $router->map('GET', '/[a:action]?', 'UserControleur'); + $router->map('GET|POST','/user/[a:action]?','UserControleur'); + $router->map('GET|POST','/admin/[a:action]?','AdminControleur'); + + $match = $router->match(); + if (!$match) { + $dVueEreur[] = "Page doesn't exist"; + echo $twig->render('erreur.html', ['dVueEreur' => $dVueEreur]); + } + else { + session_start(); + $controller=$match['target'] ?? null; + $action=$match['params']['action'] ?? null; + try { + if($controller == "AdminControleur"){ + if (!AdminModel::isAdmin()){ + $action = "connection"; + } + } + $controller = '\\controleur\\' . $controller; + $controller = new $controller; + if (is_callable(array($controller, $action))) { + call_user_func_array(array($controller, $action), + array($match['params'])); + } + } + catch (Error $error){ + $dVueEreur[] = "Controller doesn't exist"; + echo $twig->render('erreur.html', ['dVueEreur' => $dVueEreur]); + } + } + } +} \ No newline at end of file diff --git a/fluxRSS/controleur/UserControleur.php b/fluxRSS/controleur/UserControleur.php new file mode 100755 index 0000000..827434f --- /dev/null +++ b/fluxRSS/controleur/UserControleur.php @@ -0,0 +1,119 @@ +listArticle(); + break; + + case 'connection': + $this->connection();; + break; + case 'validationFormulaire': + $this->ValidationFormulaire($dVueEreur); + break; + + //mauvaise action + default: + $dVueEreur[] = "Erreur d'appel php"; + echo $twig->render('listArticle.html', ['dVueErreur'=>$dVueEreur, 'isAdmin' => AdminModel::isAdmin()]); + break; + } + } catch (\PDOException $e) { + //si erreur BD, pas le cas ici + $dVueEreur[] = 'Erreur PDO : ' . $e->getMessage(); + echo $twig->render('erreur.html', ['dVueEreur' => $dVueEreur]); + } catch (\Exception $e2) { + $dVueEreur[] = 'Erreur : ' . $e2->getMessage(); + echo $twig->render('erreur.html', ['dVueEreur' => $dVueEreur]); + } + + //fin + exit(0); + }//fin constructeur + + public function listArticle() + { + global $twig; + $articleModel = new ArticleModel(); + $dVue = [ + 'data' => $articleModel->getArticles() + ]; + echo $twig->render('listArticle.html', [ + 'dVue' => $dVue, + 'isAdmin' => AdminModel::isAdmin() + ]); + } + + /** + * @throws \Twig\Error\RuntimeError + * @throws \Twig\Error\SyntaxError + * @throws \Twig\Error\LoaderError + */ + public function connection(){ + global $twig; // nécessaire pour utiliser variables globales + echo $twig->render('Connection.html'); + if (isset($_POST['username']) && isset($_POST['password'])) { + $this->login(); + } + } + + public function login(){ + $username = $_POST['username']; + $password = $_POST['password']; + + $adminModel = new AdminModel(); + $admin = $adminModel->connection($username, $password); + + if ($admin != null) { + $this->listArticle(); + } + else{ + unset($_POST['username']); + unset($_POST['passwords']); + $this->connection(); + } + } + + public function ValidationFormulaire(array $dVueEreur) + { + global $twig; // nécessaire pour utiliser variables globales + + //si exception, ca remonte !!! + $nom = $_POST['txtNom']; // txtNom = nom du champ texte dans le formulaire + $age = $_POST['txtAge']; + \config\Validation::val_form($nom, $age, $dVueEreur); + + /* + $model = new \metier\Simplemodel(); + $data = $model->get_data(); + */ + + $dVue = [ + 'nom' => $nom, + 'age' => $age, + //'data' => $data, + ]; + + echo $twig->render('Connection.html', ['dVue' => $dVue, 'dVueEreur' => $dVueEreur]); + } +}//fin class diff --git a/fluxRSS/dannyvankooten-AltoRouter-ac028a7/.github/workflows/php.yml b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/.github/workflows/php.yml new file mode 100755 index 0000000..c428ab7 --- /dev/null +++ b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/.github/workflows/php.yml @@ -0,0 +1,39 @@ +name: PHP + +on: [ push, pull_request ] + +jobs: + build: + runs-on: ubuntu-latest + strategy: + matrix: + php-versions: [ '7.3', '7.4', '8.0', '8.1' ] + + steps: + - uses: actions/checkout@v2 + + - uses: shivammathur/setup-php@v2 + with: + php-version: ${{ matrix.php-versions }} + tools: composer + + - name: Validate composer.json and composer.lock + run: composer validate + + - name: Get composer cache directory + id: composer-cache + run: echo "::set-output name=dir::$(composer config cache-files-dir)" + + - name: Cache dependencies + uses: actions/cache@v2 + with: + path: ${{ steps.composer-cache.outputs.dir }} + key: ${{ runner.os }}-composer-${{ hashFiles('**/composer.lock') }} + restore-keys: ${{ runner.os }}-composer- + + - name: Install dependencies + if: steps.composer-cache.outputs.cache-hit != 'true' + run: composer install --prefer-dist --no-progress + + - name: Run test suite + run: composer run-script test \ No newline at end of file diff --git a/fluxRSS/dannyvankooten-AltoRouter-ac028a7/AltoRouter.php b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/AltoRouter.php new file mode 100755 index 0000000..31aa338 --- /dev/null +++ b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/AltoRouter.php @@ -0,0 +1,302 @@ + + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +*/ + +class AltoRouter +{ + + /** + * @var array Array of all routes (incl. named routes). + */ + protected $routes = []; + + /** + * @var array Array of all named routes. + */ + protected $namedRoutes = []; + + /** + * @var string Can be used to ignore leading part of the Request URL (if main file lives in subdirectory of host) + */ + protected $basePath = ''; + + /** + * @var array Array of default match types (regex helpers) + */ + protected $matchTypes = [ + 'i' => '[0-9]++', + 'a' => '[0-9A-Za-z]++', + 'h' => '[0-9A-Fa-f]++', + '*' => '.+?', + '**' => '.++', + '' => '[^/\.]++' + ]; + + /** + * Create router in one call from config. + * + * @param array $routes + * @param string $basePath + * @param array $matchTypes + * @throws Exception + */ + public function __construct(array $routes = [], $basePath = '', array $matchTypes = []) + { + $this->addRoutes($routes); + $this->setBasePath($basePath); + $this->addMatchTypes($matchTypes); + } + + /** + * Retrieves all routes. + * Useful if you want to process or display routes. + * @return array All routes. + */ + public function getRoutes() + { + return $this->routes; + } + + /** + * Add multiple routes at once from array in the following format: + * + * $routes = [ + * [$method, $route, $target, $name] + * ]; + * + * @param array $routes + * @return void + * @author Koen Punt + * @throws Exception + */ + public function addRoutes($routes) + { + if (!is_array($routes) && !$routes instanceof Traversable) { + throw new RuntimeException('Routes should be an array or an instance of Traversable'); + } + foreach ($routes as $route) { + call_user_func_array([$this, 'map'], $route); + } + } + + /** + * Set the base path. + * Useful if you are running your application from a subdirectory. + * @param string $basePath + */ + public function setBasePath($basePath) + { + $this->basePath = $basePath; + } + + /** + * Add named match types. It uses array_merge so keys can be overwritten. + * + * @param array $matchTypes The key is the name and the value is the regex. + */ + public function addMatchTypes(array $matchTypes) + { + $this->matchTypes = array_merge($this->matchTypes, $matchTypes); + } + + /** + * Map a route to a target + * + * @param string $method One of 5 HTTP Methods, or a pipe-separated list of multiple HTTP Methods (GET|POST|PATCH|PUT|DELETE) + * @param string $route The route regex, custom regex must start with an @. You can use multiple pre-set regex filters, like [i:id] + * @param mixed $target The target where this route should point to. Can be anything. + * @param string $name Optional name of this route. Supply if you want to reverse route this url in your application. + * @throws Exception + */ + public function map($method, $route, $target, $name = null) + { + + $this->routes[] = [$method, $route, $target, $name]; + + if ($name) { + if (isset($this->namedRoutes[$name])) { + throw new RuntimeException("Can not redeclare route '{$name}'"); + } + $this->namedRoutes[$name] = $route; + } + + return; + } + + /** + * Reversed routing + * + * Generate the URL for a named route. Replace regexes with supplied parameters + * + * @param string $routeName The name of the route. + * @param array @params Associative array of parameters to replace placeholders with. + * @return string The URL of the route with named parameters in place. + * @throws Exception + */ + public function generate($routeName, array $params = []) + { + + // Check if named route exists + if (!isset($this->namedRoutes[$routeName])) { + throw new RuntimeException("Route '{$routeName}' does not exist."); + } + + // Replace named parameters + $route = $this->namedRoutes[$routeName]; + + // prepend base path to route url again + $url = $this->basePath . $route; + + if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) { + foreach ($matches as $index => $match) { + list($block, $pre, $type, $param, $optional) = $match; + + if ($pre) { + $block = substr($block, 1); + } + + if (isset($params[$param])) { + // Part is found, replace for param value + $url = str_replace($block, $params[$param], $url); + } elseif ($optional && $index !== 0) { + // Only strip preceding slash if it's not at the base + $url = str_replace($pre . $block, '', $url); + } else { + // Strip match block + $url = str_replace($block, '', $url); + } + } + } + + return $url; + } + + /** + * Match a given Request Url against stored routes + * @param string $requestUrl + * @param string $requestMethod + * @return array|boolean Array with route information on success, false on failure (no match). + */ + public function match($requestUrl = null, $requestMethod = null) + { + + $params = []; + + // set Request Url if it isn't passed as parameter + if ($requestUrl === null) { + $requestUrl = isset($_SERVER['REQUEST_URI']) ? $_SERVER['REQUEST_URI'] : '/'; + } + + // strip base path from request url + $requestUrl = substr($requestUrl, strlen($this->basePath)); + + // Strip query string (?a=b) from Request Url + if (($strpos = strpos($requestUrl, '?')) !== false) { + $requestUrl = substr($requestUrl, 0, $strpos); + } + + $lastRequestUrlChar = $requestUrl ? $requestUrl[strlen($requestUrl)-1] : ''; + + // set Request Method if it isn't passed as a parameter + if ($requestMethod === null) { + $requestMethod = isset($_SERVER['REQUEST_METHOD']) ? $_SERVER['REQUEST_METHOD'] : 'GET'; + } + + foreach ($this->routes as $handler) { + list($methods, $route, $target, $name) = $handler; + + $method_match = (stripos($methods, $requestMethod) !== false); + + // Method did not match, continue to next route. + if (!$method_match) { + continue; + } + + if ($route === '*') { + // * wildcard (matches all) + $match = true; + } elseif (isset($route[0]) && $route[0] === '@') { + // @ regex delimiter + $pattern = '`' . substr($route, 1) . '`u'; + $match = preg_match($pattern, $requestUrl, $params) === 1; + } elseif (($position = strpos($route, '[')) === false) { + // No params in url, do string comparison + $match = strcmp($requestUrl, $route) === 0; + } else { + // Compare longest non-param string with url before moving on to regex + // Check if last character before param is a slash, because it could be optional if param is optional too (see https://github.com/dannyvankooten/AltoRouter/issues/241) + if (strncmp($requestUrl, $route, $position) !== 0 && ($lastRequestUrlChar === '/' || $route[$position-1] !== '/')) { + continue; + } + + $regex = $this->compileRoute($route); + $match = preg_match($regex, $requestUrl, $params) === 1; + } + + if ($match) { + if ($params) { + foreach ($params as $key => $value) { + if (is_numeric($key)) { + unset($params[$key]); + } + } + } + + return [ + 'target' => $target, + 'params' => $params, + 'name' => $name + ]; + } + } + + return false; + } + + /** + * Compile the regex for a given route (EXPENSIVE) + * @param $route + * @return string + */ + protected function compileRoute($route) + { + if (preg_match_all('`(/|\.|)\[([^:\]]*+)(?::([^:\]]*+))?\](\?|)`', $route, $matches, PREG_SET_ORDER)) { + $matchTypes = $this->matchTypes; + foreach ($matches as $match) { + list($block, $pre, $type, $param, $optional) = $match; + + if (isset($matchTypes[$type])) { + $type = $matchTypes[$type]; + } + if ($pre === '.') { + $pre = '\.'; + } + + $optional = $optional !== '' ? '?' : null; + + //Older versions of PCRE require the 'P' in (?P) + $pattern = '(?:' + . ($pre !== '' ? $pre : null) + . '(' + . ($param !== '' ? "?P<$param>" : null) + . $type + . ')' + . $optional + . ')' + . $optional; + + $route = str_replace($block, $pattern, $route); + } + } + return "`^$route$`u"; + } +} diff --git a/fluxRSS/dannyvankooten-AltoRouter-ac028a7/LICENSE.md b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/LICENSE.md new file mode 100755 index 0000000..a1130bb --- /dev/null +++ b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/LICENSE.md @@ -0,0 +1,9 @@ +MIT License + +Copyright (c) 2012 Danny van Kooten + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. \ No newline at end of file diff --git a/fluxRSS/dannyvankooten-AltoRouter-ac028a7/README.md b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/README.md new file mode 100755 index 0000000..7d6e1fe --- /dev/null +++ b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/README.md @@ -0,0 +1,57 @@ +# AltoRouter ![PHP status](https://github.com/dannyvankooten/AltoRouter/workflows/PHP/badge.svg) [![Latest Stable Version](https://poser.pugx.org/altorouter/altorouter/v/stable.svg)](https://packagist.org/packages/altorouter/altorouter) [![License](https://poser.pugx.org/altorouter/altorouter/license.svg)](https://packagist.org/packages/altorouter/altorouter) + +AltoRouter is a small but powerful routing class, heavily inspired by [klein.php](https://github.com/chriso/klein.php/). + +```php +$router = new AltoRouter(); + +// map homepage +$router->map('GET', '/', function() { + require __DIR__ . '/views/home.php'; +}); + +// dynamic named route +$router->map('GET|POST', '/users/[i:id]/', function($id) { + $user = ..... + require __DIR__ . '/views/user/details.php'; +}, 'user-details'); + +// echo URL to user-details page for ID 5 +echo $router->generate('user-details', ['id' => 5]); // Output: "/users/5" +``` + +## Features + +* Can be used with all HTTP Methods +* Dynamic routing with named route parameters +* Reversed routing +* Flexible regular expression routing (inspired by [Sinatra](http://www.sinatrarb.com/)) +* Custom regexes + +## Getting started + +You need PHP >= 5.6 to use AltoRouter, although we highly recommend you [use an officially supported PHP version](https://secure.php.net/supported-versions.php) that is not EOL. + +- [Install AltoRouter](http://altorouter.com/usage/install.html) +- [Rewrite all requests to AltoRouter](http://altorouter.com/usage/rewrite-requests.html) +- [Map your routes](http://altorouter.com/usage/mapping-routes.html) +- [Match requests](http://altorouter.com/usage/matching-requests.html) +- [Process the request your preferred way](http://altorouter.com/usage/processing-requests.html) + +## Contributors +- [Danny van Kooten](https://github.com/dannyvankooten) +- [Koen Punt](https://github.com/koenpunt) +- [John Long](https://github.com/adduc) +- [Niahoo Osef](https://github.com/niahoo) + +## License + +MIT License + +Copyright (c) 2012 Danny van Kooten + +Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. diff --git a/fluxRSS/dannyvankooten-AltoRouter-ac028a7/composer.json b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/composer.json new file mode 100755 index 0000000..05bcb40 --- /dev/null +++ b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/composer.json @@ -0,0 +1,35 @@ +{ + "name": "altorouter/altorouter", + "description": "A lightning fast router for PHP", + "keywords": ["router", "routing", "lightweight"], + "homepage": "https://github.com/dannyvankooten/AltoRouter", + "license": "MIT", + "authors": [ + { + "name": "Danny van Kooten", + "email": "dannyvankooten@gmail.com", + "homepage": "http://dannyvankooten.com/" + }, + { + "name": "Koen Punt", + "homepage": "https://github.com/koenpunt" + }, + { + "name": "niahoo", + "homepage": "https://github.com/niahoo" + } + ], + "require": { + "php": ">=5.6.0" + }, + "require-dev": { + "phpunit/phpunit": "9.5.*", + "squizlabs/php_codesniffer": "3.6.2" + }, + "autoload": { + "classmap": ["AltoRouter.php"] + }, + "scripts": { + "test": "vendor/bin/phpunit" + } +} diff --git a/fluxRSS/dannyvankooten-AltoRouter-ac028a7/phpcs.xml b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/phpcs.xml new file mode 100755 index 0000000..d59cccf --- /dev/null +++ b/fluxRSS/dannyvankooten-AltoRouter-ac028a7/phpcs.xml @@ -0,0 +1,10 @@ + + + rules + + + tests + AltoRouter.php + examples/ + + diff --git a/mvc_PSR4_twig/index.php b/fluxRSS/index.php similarity index 71% rename from mvc_PSR4_twig/index.php rename to fluxRSS/index.php index 0c2f9ea..1eb4352 100755 --- a/mvc_PSR4_twig/index.php +++ b/fluxRSS/index.php @@ -1,16 +1,18 @@ - 'cache', -]); - -$cont = new Controleur(); + false, +]); + +$cont = new FrontControleur(); + + diff --git a/fluxRSS/metier/Admin.php b/fluxRSS/metier/Admin.php new file mode 100755 index 0000000..ab0df11 --- /dev/null +++ b/fluxRSS/metier/Admin.php @@ -0,0 +1,46 @@ +username = $username; + $this->mail = $mail; + } + + /** + * @return string + */ + public function getUsername(): string + { + return $this->username; + } + + /** + * @param string $username + */ + public function setUsername(string $username): void + { + $this->username = $username; + } + + /** + * @return string + */ + public function getMail(): string + { + return $this->mail; + } + + /** + * @param string $mail + */ + public function setMail(string $mail): void + { + $this->mail = $mail; + } +} \ No newline at end of file diff --git a/fluxRSS/metier/Article.php b/fluxRSS/metier/Article.php new file mode 100755 index 0000000..809c3d1 --- /dev/null +++ b/fluxRSS/metier/Article.php @@ -0,0 +1,123 @@ +id = $id; + $this->title = $title; + $this->date = $date; + $this->description = $description; + $this->guid = $guid; + $this->link = $link; + $this->mediaContent = $mediaContent; + $this->provenance = $provenance; + } + + public function getId(): int + { + return $this->id; + } + + public function setId(int $id): void + { + $this->id = $id; + } + + public function getTitle(): string + { + return $this->title; + } + + public function setTitle(string $title): void + { + $this->title = $title; + } + + public function getDate(): string + { + return $this->date; + } + + public function setDate(string $date): void + { + $this->date = $date; + } + + public function getDescription(): string + { + return $this->description; + } + + public function setDescription(string $description): void + { + $this->description = $description; + } + + public function getGuid(): string + { + return $this->guid; + } + + public function setGuid(string $guid): void + { + $this->guid = $guid; + } + + public function getLink(): string + { + return $this->link; + } + + public function setLink(string $link): void + { + $this->link = $link; + } + + public function getMediaContent(): string + { + return $this->mediaContent; + } + + public function setMediaContent(string $mediaContent): void + { + $this->mediaContent = $mediaContent; + } + + public function getProvenance(): int + { + return $this->provenance; + } + + public function setProvenance(int $provenance): void + { + $this->provenance = $provenance; + } + + public function __toString(): string + { + return $this->title . $this->date . $this->description; + } + +} \ No newline at end of file diff --git a/fluxRSS/metier/Flux.php b/fluxRSS/metier/Flux.php new file mode 100755 index 0000000..a167fbe --- /dev/null +++ b/fluxRSS/metier/Flux.php @@ -0,0 +1,33 @@ +flux; + } + + /** + * @param string $flux + */ + public function setFlux(string $flux): void + { + $this->flux = $flux; + } + + /** + * @return string + */ + public function getId(): string + { + return $this->id; + } +} \ No newline at end of file diff --git a/fluxRSS/model/AdminModel.php b/fluxRSS/model/AdminModel.php new file mode 100755 index 0000000..3350adc --- /dev/null +++ b/fluxRSS/model/AdminModel.php @@ -0,0 +1,35 @@ +login($username); + + foreach ($lmdp as $motDePasse){ + if (password_verify($mdp,$motDePasse['password']) or $mdp == $motDePasse['password']){ + $_SESSION['role'] = 'admin'; + $_SESSION['pseudo'] = $username; + return new Admin($username,$motDePasse['mail']); + } + } + return null; + } + + public static function isAdmin(): bool + { + return isset($_SESSION['role']) && $_SESSION['role'] == 'admin'; + } +} \ No newline at end of file diff --git a/fluxRSS/model/ArticleModel.php b/fluxRSS/model/ArticleModel.php new file mode 100755 index 0000000..d8e24e8 --- /dev/null +++ b/fluxRSS/model/ArticleModel.php @@ -0,0 +1,24 @@ +getAllArticles(); + foreach($res as $row){ + $tabArticle[] = new Article($row['id'], $row['title'],$row['datePub'],$row['description'],$row['guid'],$row['link'],$row['mediaContent'],$row['provenance'] ); + } + return $tabArticle; + } +} \ No newline at end of file diff --git a/fluxRSS/model/FluxModel.php b/fluxRSS/model/FluxModel.php new file mode 100755 index 0000000..5116de9 --- /dev/null +++ b/fluxRSS/model/FluxModel.php @@ -0,0 +1,71 @@ +findAllFlux(); + + foreach ($result as $row){ + $data[] = new Flux($row['$flux']); + } + return $data; + } + + public function addFlux(Flux $flux){ + $gateway = new FluxGateway(new Connection('mysql:host= londres.uca.local ; dbname= dbrorossetto', 'rorossetto', 'tpphp')); + $data = $this->findFlux($flux); + if ($data == array()) { + $gateway->addFlux($flux); + } + } + + public function addFluxBySrc(string $flux): Flux { + $gateway = new FluxGateway(new Connection('mysql:host= londres.uca.local ; dbname= dbrorossetto', 'rorossetto', 'tpphp')); + $newFlux = new Flux($flux); + $gateway->addFlux($newFlux); + return $newFlux; + } + + public function removeFlux(Flux $flux){ + $gateway = new FluxGateway(new Connection('mysql:host= londres.uca.local ; dbname= dbrorossetto', 'rorossetto', 'tpphp')); + $gateway->removeFlux($flux); + } + + public function removeFluxBySrc(string $flux): Flux { + $gateway = new FluxGateway(new Connection('mysql:host= londres.uca.local ; dbname= dbrorossetto', 'rorossetto', 'tpphp')); + $newFlux = new Flux($flux); + $gateway->removeFlux($newFlux); + return $newFlux; + } + + public function findFlux(Flux $flux){ + $gateway = new FluxGateway(new Connection('mysql:host= londres.uca.local ; dbname= dbrorossetto', 'rorossetto', 'tpphp')); + $data = array(); + $result = $gateway->findFlux($flux); + + foreach ($result as $row){ + $data[] = new Flux($row['$flux']); + } + return $data; + } + + public function findFluxBySrc(string $flux){ + $gateway = new FluxGateway(new Connection('mysql:host= londres.uca.local ; dbname= dbrorossetto', 'rorossetto', 'tpphp')); + $data = array(); + $result = $gateway->findFluxBySrc($flux); + + foreach ($result as $row){ + $data[] = new Flux($row['$flux']); + } + return $data; + } +} \ No newline at end of file diff --git a/fluxRSS/model/Parser.php b/fluxRSS/model/Parser.php new file mode 100755 index 0000000..beb59f8 --- /dev/null +++ b/fluxRSS/model/Parser.php @@ -0,0 +1,84 @@ +fluxGateway = $fluxGateway; + $this->articleGateway = $articleGateway; + } + public function parseArticles(Flux $flux): array + { + $dom = new DOMDocument(); + $tabArticle = array(); + + if ($dom->load($flux->getFlux())){ + $items = $dom->getElementsByTagName('item'); + + foreach ($items as $item) { + $title = $item->getElementsByTagName('title')[0]->nodeValue; + $date = $item->getElementsByTagName('pubDate')[0]->nodeValue; + $guid = $item->getElementsByTagName('guid')[0]->nodeValue; + $link = $item->getElementsByTagName('link')[0]->nodeValue; + $description = $item->getElementsByTagName('description')[0]->nodeValue; + + $media = $item->getElementsByTagName('media:content'); + $mediaUrl = null; + if ($media->length > 0){ + $mediaUrl = $media->item(0)->getAttribute('url'); + } + + $tabArticle[] = new Article((int)null, $title, $date, $description, $guid, $link, $mediaUrl, $flux->getId()); + } + return $tabArticle; + } else { + // En cas d'erreur lors du chargement du flux RSS, lever une exception + throw new Exception("Erreur lors du chargement du flux RSS"); + } + } + + + /** + * @throws Exception + */ + public function parseAll($fluxes){ + foreach ($fluxes as $flux){ + $tabArticles[] =$this->parseArticles($flux); + } + return $tabArticles; + } + + /** + * @throws Exception + */ + public function addAllArticles() + { + $this->articleGateway->removeAllArticleForParser(); + + $allFlux = $this->fluxGateway->findAllFlux(); + $allArticles = $this->parseAll($allFlux); + foreach ($allArticles as $article) { + $this->articleGateway->addArticle($article); + } + return $allArticles; + } + +} +$gwArt = new ArticleGateway(new Connection('mysql:host=londres.uca.local;dbname=dbrorossetto', 'rorossetto', 'tpphp')); +$gwFl = new FluxGateway(new Connection('mysql:host=londres.uca.local;dbname=dbrorossetto', 'rorossetto', 'tpphp')); +$pars = new Parser( $gwFl,$gwArt); + + + diff --git a/mvc_PSR4_twig/templates/.DS_Store b/fluxRSS/templates/.DS_Store similarity index 100% rename from mvc_PSR4_twig/templates/.DS_Store rename to fluxRSS/templates/.DS_Store diff --git a/fluxRSS/templates/Connection.html b/fluxRSS/templates/Connection.html new file mode 100755 index 0000000..8a9cf92 --- /dev/null +++ b/fluxRSS/templates/Connection.html @@ -0,0 +1,58 @@ + + + + + + Login + + + +
+ {% if dVue is defined %} + {% if dVueEreur is defined and dVueEreur|length >0 %} +

ERREUR !!!!!

+ {% for value in dVueEreur %} +

{{value}}

+ {% endfor %} + {% endif %} + {% endif %} + +

Login

+
+ + + + + + + + + +
Nom + +
Password + + +
+ + + + + +
+ + +
+ Not a member? Go to Articles +
+ + + + + + + + + Login + + \ No newline at end of file diff --git a/mvc_PSR4_twig/templates/erreur.html b/fluxRSS/templates/erreur.html similarity index 95% rename from mvc_PSR4_twig/templates/erreur.html rename to fluxRSS/templates/erreur.html index e0cbf8f..a376f0f 100755 --- a/mvc_PSR4_twig/templates/erreur.html +++ b/fluxRSS/templates/erreur.html @@ -1,17 +1,17 @@ - - - - - - Erreur - - - -

ERREUR page !!!!!

- {% if dVueEreur is defined %} - {% for value in dVueEreur %} -

{{value}}

- {% endfor %} - {% endif %} - - + + + + + + Erreur + + + +

ERREUR page !!!!!

+ {% if dVueEreur is defined %} + {% for value in dVueEreur %} +

{{value}}

+ {% endfor %} + {% endif %} + + diff --git a/fluxRSS/templates/listArticle.html b/fluxRSS/templates/listArticle.html new file mode 100755 index 0000000..b807901 --- /dev/null +++ b/fluxRSS/templates/listArticle.html @@ -0,0 +1,21 @@ + + + + + All Articles + + +{% for value in dVue.data %} +

+ {% for article in value %} +

+ {{article}} +

+ {% endfor %} +

+{% endfor %} +{% if not isAdmin %} + Connect +{% endif %} + + \ No newline at end of file diff --git a/mvc_PSR4_twig/vendor/.DS_Store b/fluxRSS/vendor/.DS_Store similarity index 100% rename from mvc_PSR4_twig/vendor/.DS_Store rename to fluxRSS/vendor/.DS_Store diff --git a/mvc_PSR4_twig/vendor/autoload.php b/fluxRSS/vendor/autoload.php similarity index 100% rename from mvc_PSR4_twig/vendor/autoload.php rename to fluxRSS/vendor/autoload.php diff --git a/mvc_PSR4_twig/vendor/composer/ClassLoader.php b/fluxRSS/vendor/composer/ClassLoader.php similarity index 100% rename from mvc_PSR4_twig/vendor/composer/ClassLoader.php rename to fluxRSS/vendor/composer/ClassLoader.php diff --git a/mvc_PSR4_twig/vendor/composer/InstalledVersions.php b/fluxRSS/vendor/composer/InstalledVersions.php similarity index 100% rename from mvc_PSR4_twig/vendor/composer/InstalledVersions.php rename to fluxRSS/vendor/composer/InstalledVersions.php diff --git a/mvc_PSR4_twig/vendor/composer/LICENSE b/fluxRSS/vendor/composer/LICENSE similarity index 100% rename from mvc_PSR4_twig/vendor/composer/LICENSE rename to fluxRSS/vendor/composer/LICENSE diff --git a/mvc_PSR4_twig/vendor/composer/autoload_classmap.php b/fluxRSS/vendor/composer/autoload_classmap.php similarity index 100% rename from mvc_PSR4_twig/vendor/composer/autoload_classmap.php rename to fluxRSS/vendor/composer/autoload_classmap.php diff --git a/mvc_PSR4_twig/vendor/composer/autoload_files.php b/fluxRSS/vendor/composer/autoload_files.php similarity index 100% rename from mvc_PSR4_twig/vendor/composer/autoload_files.php rename to fluxRSS/vendor/composer/autoload_files.php diff --git a/mvc_PSR4_twig/vendor/composer/autoload_namespaces.php b/fluxRSS/vendor/composer/autoload_namespaces.php similarity index 100% rename from mvc_PSR4_twig/vendor/composer/autoload_namespaces.php rename to fluxRSS/vendor/composer/autoload_namespaces.php diff --git a/mvc_PSR4_twig/vendor/composer/autoload_psr4.php b/fluxRSS/vendor/composer/autoload_psr4.php similarity index 77% rename from mvc_PSR4_twig/vendor/composer/autoload_psr4.php rename to fluxRSS/vendor/composer/autoload_psr4.php index abb6bf8..1002bc1 100755 --- a/mvc_PSR4_twig/vendor/composer/autoload_psr4.php +++ b/fluxRSS/vendor/composer/autoload_psr4.php @@ -6,10 +6,12 @@ $vendorDir = dirname(__DIR__); $baseDir = dirname($vendorDir); return array( - 'modeles\\' => array($baseDir . '/modeles'), + 'model\\' => array($baseDir . '/model'), + 'metier\\' => array($baseDir . '/metier'), 'controleur\\' => array($baseDir . '/controleur'), 'config\\' => array($baseDir . '/config'), 'Twig\\' => array($vendorDir . '/twig/twig/src'), 'Symfony\\Polyfill\\Mbstring\\' => array($vendorDir . '/symfony/polyfill-mbstring'), 'Symfony\\Polyfill\\Ctype\\' => array($vendorDir . '/symfony/polyfill-ctype'), + 'DAL\\' => array($baseDir . '/DAL'), ); diff --git a/mvc_PSR4_twig/vendor/composer/autoload_real.php b/fluxRSS/vendor/composer/autoload_real.php similarity index 100% rename from mvc_PSR4_twig/vendor/composer/autoload_real.php rename to fluxRSS/vendor/composer/autoload_real.php diff --git a/mvc_PSR4_twig/vendor/composer/autoload_static.php b/fluxRSS/vendor/composer/autoload_static.php similarity index 84% rename from mvc_PSR4_twig/vendor/composer/autoload_static.php rename to fluxRSS/vendor/composer/autoload_static.php index dc37466..868aa69 100755 --- a/mvc_PSR4_twig/vendor/composer/autoload_static.php +++ b/fluxRSS/vendor/composer/autoload_static.php @@ -14,7 +14,8 @@ class ComposerStaticInita6287a55fe354aae4af95d1e4395c915 public static $prefixLengthsPsr4 = array ( 'm' => array ( - 'modeles\\' => 8, + 'model\\' => 6, + 'metier\\' => 7, ), 'c' => array ( @@ -30,12 +31,20 @@ class ComposerStaticInita6287a55fe354aae4af95d1e4395c915 'Symfony\\Polyfill\\Mbstring\\' => 26, 'Symfony\\Polyfill\\Ctype\\' => 23, ), + 'D' => + array ( + 'DAL\\' => 4, + ), ); public static $prefixDirsPsr4 = array ( - 'modeles\\' => + 'model\\' => + array ( + 0 => __DIR__ . '/../..' . '/model', + ), + 'metier\\' => array ( - 0 => __DIR__ . '/../..' . '/modeles', + 0 => __DIR__ . '/../..' . '/metier', ), 'controleur\\' => array ( @@ -57,6 +66,10 @@ class ComposerStaticInita6287a55fe354aae4af95d1e4395c915 array ( 0 => __DIR__ . '/..' . '/symfony/polyfill-ctype', ), + 'DAL\\' => + array ( + 0 => __DIR__ . '/../..' . '/DAL', + ), ); public static $classMap = array ( diff --git a/mvc_PSR4_twig/vendor/composer/installed.json b/fluxRSS/vendor/composer/installed.json similarity index 100% rename from mvc_PSR4_twig/vendor/composer/installed.json rename to fluxRSS/vendor/composer/installed.json diff --git a/mvc_PSR4_twig/vendor/composer/installed.php b/fluxRSS/vendor/composer/installed.php similarity index 83% rename from mvc_PSR4_twig/vendor/composer/installed.php rename to fluxRSS/vendor/composer/installed.php index a25b246..26f8284 100755 --- a/mvc_PSR4_twig/vendor/composer/installed.php +++ b/fluxRSS/vendor/composer/installed.php @@ -1,9 +1,9 @@ array( 'name' => '__root__', - 'pretty_version' => '1.0.0+no-version-set', - 'version' => '1.0.0.0', - 'reference' => NULL, + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'reference' => 'c00c0a1c491c44a1666572f040f9b9df34933d25', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -11,9 +11,9 @@ ), 'versions' => array( '__root__' => array( - 'pretty_version' => '1.0.0+no-version-set', - 'version' => '1.0.0.0', - 'reference' => NULL, + 'pretty_version' => 'dev-master', + 'version' => 'dev-master', + 'reference' => 'c00c0a1c491c44a1666572f040f9b9df34933d25', 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), diff --git a/mvc_PSR4_twig/vendor/composer/platform_check.php b/fluxRSS/vendor/composer/platform_check.php similarity index 100% rename from mvc_PSR4_twig/vendor/composer/platform_check.php rename to fluxRSS/vendor/composer/platform_check.php diff --git a/mvc_PSR4_twig/vendor/symfony/polyfill-ctype/Ctype.php b/fluxRSS/vendor/symfony/polyfill-ctype/Ctype.php similarity index 100% rename from mvc_PSR4_twig/vendor/symfony/polyfill-ctype/Ctype.php rename to fluxRSS/vendor/symfony/polyfill-ctype/Ctype.php diff --git a/mvc_PSR4_twig/vendor/symfony/polyfill-ctype/LICENSE b/fluxRSS/vendor/symfony/polyfill-ctype/LICENSE similarity index 100% rename from mvc_PSR4_twig/vendor/symfony/polyfill-ctype/LICENSE rename to fluxRSS/vendor/symfony/polyfill-ctype/LICENSE diff --git a/mvc_PSR4_twig/vendor/symfony/polyfill-ctype/README.md b/fluxRSS/vendor/symfony/polyfill-ctype/README.md similarity index 100% rename from mvc_PSR4_twig/vendor/symfony/polyfill-ctype/README.md rename to fluxRSS/vendor/symfony/polyfill-ctype/README.md diff --git a/mvc_PSR4_twig/vendor/symfony/polyfill-ctype/bootstrap.php b/fluxRSS/vendor/symfony/polyfill-ctype/bootstrap.php similarity index 100% rename from mvc_PSR4_twig/vendor/symfony/polyfill-ctype/bootstrap.php rename to fluxRSS/vendor/symfony/polyfill-ctype/bootstrap.php diff --git a/mvc_PSR4_twig/vendor/symfony/polyfill-ctype/bootstrap80.php b/fluxRSS/vendor/symfony/polyfill-ctype/bootstrap80.php similarity index 100% rename from mvc_PSR4_twig/vendor/symfony/polyfill-ctype/bootstrap80.php rename to fluxRSS/vendor/symfony/polyfill-ctype/bootstrap80.php diff --git a/mvc_PSR4_twig/vendor/symfony/polyfill-ctype/composer.json b/fluxRSS/vendor/symfony/polyfill-ctype/composer.json similarity index 100% rename from mvc_PSR4_twig/vendor/symfony/polyfill-ctype/composer.json rename to fluxRSS/vendor/symfony/polyfill-ctype/composer.json diff --git a/mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/LICENSE b/fluxRSS/vendor/symfony/polyfill-mbstring/LICENSE similarity index 100% rename from mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/LICENSE rename to fluxRSS/vendor/symfony/polyfill-mbstring/LICENSE diff --git a/mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/Mbstring.php b/fluxRSS/vendor/symfony/polyfill-mbstring/Mbstring.php similarity index 100% rename from mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/Mbstring.php rename to fluxRSS/vendor/symfony/polyfill-mbstring/Mbstring.php diff --git a/mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/README.md b/fluxRSS/vendor/symfony/polyfill-mbstring/README.md similarity index 100% rename from mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/README.md rename to fluxRSS/vendor/symfony/polyfill-mbstring/README.md diff --git a/mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/Resources/unidata/caseFolding.php b/fluxRSS/vendor/symfony/polyfill-mbstring/Resources/unidata/caseFolding.php similarity index 100% rename from mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/Resources/unidata/caseFolding.php rename to fluxRSS/vendor/symfony/polyfill-mbstring/Resources/unidata/caseFolding.php diff --git a/mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php b/fluxRSS/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php similarity index 100% rename from mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php rename to fluxRSS/vendor/symfony/polyfill-mbstring/Resources/unidata/lowerCase.php diff --git a/mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php b/fluxRSS/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php similarity index 100% rename from mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php rename to fluxRSS/vendor/symfony/polyfill-mbstring/Resources/unidata/titleCaseRegexp.php diff --git a/mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php b/fluxRSS/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php similarity index 100% rename from mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php rename to fluxRSS/vendor/symfony/polyfill-mbstring/Resources/unidata/upperCase.php diff --git a/mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/bootstrap.php b/fluxRSS/vendor/symfony/polyfill-mbstring/bootstrap.php similarity index 100% rename from mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/bootstrap.php rename to fluxRSS/vendor/symfony/polyfill-mbstring/bootstrap.php diff --git a/mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/bootstrap80.php b/fluxRSS/vendor/symfony/polyfill-mbstring/bootstrap80.php similarity index 100% rename from mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/bootstrap80.php rename to fluxRSS/vendor/symfony/polyfill-mbstring/bootstrap80.php diff --git a/mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/composer.json b/fluxRSS/vendor/symfony/polyfill-mbstring/composer.json similarity index 100% rename from mvc_PSR4_twig/vendor/symfony/polyfill-mbstring/composer.json rename to fluxRSS/vendor/symfony/polyfill-mbstring/composer.json diff --git a/mvc_PSR4_twig/vendor/twig/.DS_Store b/fluxRSS/vendor/twig/.DS_Store similarity index 100% rename from mvc_PSR4_twig/vendor/twig/.DS_Store rename to fluxRSS/vendor/twig/.DS_Store diff --git a/mvc_PSR4_twig/vendor/twig/twig/.DS_Store b/fluxRSS/vendor/twig/twig/.DS_Store similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/.DS_Store rename to fluxRSS/vendor/twig/twig/.DS_Store diff --git a/mvc_PSR4_twig/vendor/twig/twig/CHANGELOG b/fluxRSS/vendor/twig/twig/CHANGELOG similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/CHANGELOG rename to fluxRSS/vendor/twig/twig/CHANGELOG diff --git a/mvc_PSR4_twig/vendor/twig/twig/LICENSE b/fluxRSS/vendor/twig/twig/LICENSE similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/LICENSE rename to fluxRSS/vendor/twig/twig/LICENSE diff --git a/mvc_PSR4_twig/vendor/twig/twig/README.rst b/fluxRSS/vendor/twig/twig/README.rst similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/README.rst rename to fluxRSS/vendor/twig/twig/README.rst diff --git a/mvc_PSR4_twig/vendor/twig/twig/composer.json b/fluxRSS/vendor/twig/twig/composer.json similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/composer.json rename to fluxRSS/vendor/twig/twig/composer.json diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Cache/CacheInterface.php b/fluxRSS/vendor/twig/twig/src/Cache/CacheInterface.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Cache/CacheInterface.php rename to fluxRSS/vendor/twig/twig/src/Cache/CacheInterface.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Cache/FilesystemCache.php b/fluxRSS/vendor/twig/twig/src/Cache/FilesystemCache.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Cache/FilesystemCache.php rename to fluxRSS/vendor/twig/twig/src/Cache/FilesystemCache.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Cache/NullCache.php b/fluxRSS/vendor/twig/twig/src/Cache/NullCache.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Cache/NullCache.php rename to fluxRSS/vendor/twig/twig/src/Cache/NullCache.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Compiler.php b/fluxRSS/vendor/twig/twig/src/Compiler.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Compiler.php rename to fluxRSS/vendor/twig/twig/src/Compiler.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Environment.php b/fluxRSS/vendor/twig/twig/src/Environment.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Environment.php rename to fluxRSS/vendor/twig/twig/src/Environment.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Error/Error.php b/fluxRSS/vendor/twig/twig/src/Error/Error.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Error/Error.php rename to fluxRSS/vendor/twig/twig/src/Error/Error.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Error/LoaderError.php b/fluxRSS/vendor/twig/twig/src/Error/LoaderError.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Error/LoaderError.php rename to fluxRSS/vendor/twig/twig/src/Error/LoaderError.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Error/RuntimeError.php b/fluxRSS/vendor/twig/twig/src/Error/RuntimeError.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Error/RuntimeError.php rename to fluxRSS/vendor/twig/twig/src/Error/RuntimeError.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Error/SyntaxError.php b/fluxRSS/vendor/twig/twig/src/Error/SyntaxError.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Error/SyntaxError.php rename to fluxRSS/vendor/twig/twig/src/Error/SyntaxError.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/ExpressionParser.php b/fluxRSS/vendor/twig/twig/src/ExpressionParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/ExpressionParser.php rename to fluxRSS/vendor/twig/twig/src/ExpressionParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Extension/AbstractExtension.php b/fluxRSS/vendor/twig/twig/src/Extension/AbstractExtension.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Extension/AbstractExtension.php rename to fluxRSS/vendor/twig/twig/src/Extension/AbstractExtension.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Extension/CoreExtension.php b/fluxRSS/vendor/twig/twig/src/Extension/CoreExtension.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Extension/CoreExtension.php rename to fluxRSS/vendor/twig/twig/src/Extension/CoreExtension.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Extension/DebugExtension.php b/fluxRSS/vendor/twig/twig/src/Extension/DebugExtension.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Extension/DebugExtension.php rename to fluxRSS/vendor/twig/twig/src/Extension/DebugExtension.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Extension/EscaperExtension.php b/fluxRSS/vendor/twig/twig/src/Extension/EscaperExtension.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Extension/EscaperExtension.php rename to fluxRSS/vendor/twig/twig/src/Extension/EscaperExtension.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Extension/ExtensionInterface.php b/fluxRSS/vendor/twig/twig/src/Extension/ExtensionInterface.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Extension/ExtensionInterface.php rename to fluxRSS/vendor/twig/twig/src/Extension/ExtensionInterface.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Extension/GlobalsInterface.php b/fluxRSS/vendor/twig/twig/src/Extension/GlobalsInterface.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Extension/GlobalsInterface.php rename to fluxRSS/vendor/twig/twig/src/Extension/GlobalsInterface.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Extension/OptimizerExtension.php b/fluxRSS/vendor/twig/twig/src/Extension/OptimizerExtension.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Extension/OptimizerExtension.php rename to fluxRSS/vendor/twig/twig/src/Extension/OptimizerExtension.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Extension/ProfilerExtension.php b/fluxRSS/vendor/twig/twig/src/Extension/ProfilerExtension.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Extension/ProfilerExtension.php rename to fluxRSS/vendor/twig/twig/src/Extension/ProfilerExtension.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Extension/RuntimeExtensionInterface.php b/fluxRSS/vendor/twig/twig/src/Extension/RuntimeExtensionInterface.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Extension/RuntimeExtensionInterface.php rename to fluxRSS/vendor/twig/twig/src/Extension/RuntimeExtensionInterface.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Extension/SandboxExtension.php b/fluxRSS/vendor/twig/twig/src/Extension/SandboxExtension.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Extension/SandboxExtension.php rename to fluxRSS/vendor/twig/twig/src/Extension/SandboxExtension.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Extension/StagingExtension.php b/fluxRSS/vendor/twig/twig/src/Extension/StagingExtension.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Extension/StagingExtension.php rename to fluxRSS/vendor/twig/twig/src/Extension/StagingExtension.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Extension/StringLoaderExtension.php b/fluxRSS/vendor/twig/twig/src/Extension/StringLoaderExtension.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Extension/StringLoaderExtension.php rename to fluxRSS/vendor/twig/twig/src/Extension/StringLoaderExtension.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/ExtensionSet.php b/fluxRSS/vendor/twig/twig/src/ExtensionSet.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/ExtensionSet.php rename to fluxRSS/vendor/twig/twig/src/ExtensionSet.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/FileExtensionEscapingStrategy.php b/fluxRSS/vendor/twig/twig/src/FileExtensionEscapingStrategy.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/FileExtensionEscapingStrategy.php rename to fluxRSS/vendor/twig/twig/src/FileExtensionEscapingStrategy.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Lexer.php b/fluxRSS/vendor/twig/twig/src/Lexer.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Lexer.php rename to fluxRSS/vendor/twig/twig/src/Lexer.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Loader/ArrayLoader.php b/fluxRSS/vendor/twig/twig/src/Loader/ArrayLoader.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Loader/ArrayLoader.php rename to fluxRSS/vendor/twig/twig/src/Loader/ArrayLoader.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Loader/ChainLoader.php b/fluxRSS/vendor/twig/twig/src/Loader/ChainLoader.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Loader/ChainLoader.php rename to fluxRSS/vendor/twig/twig/src/Loader/ChainLoader.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Loader/FilesystemLoader.php b/fluxRSS/vendor/twig/twig/src/Loader/FilesystemLoader.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Loader/FilesystemLoader.php rename to fluxRSS/vendor/twig/twig/src/Loader/FilesystemLoader.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Loader/LoaderInterface.php b/fluxRSS/vendor/twig/twig/src/Loader/LoaderInterface.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Loader/LoaderInterface.php rename to fluxRSS/vendor/twig/twig/src/Loader/LoaderInterface.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Markup.php b/fluxRSS/vendor/twig/twig/src/Markup.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Markup.php rename to fluxRSS/vendor/twig/twig/src/Markup.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/AutoEscapeNode.php b/fluxRSS/vendor/twig/twig/src/Node/AutoEscapeNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/AutoEscapeNode.php rename to fluxRSS/vendor/twig/twig/src/Node/AutoEscapeNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/BlockNode.php b/fluxRSS/vendor/twig/twig/src/Node/BlockNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/BlockNode.php rename to fluxRSS/vendor/twig/twig/src/Node/BlockNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/BlockReferenceNode.php b/fluxRSS/vendor/twig/twig/src/Node/BlockReferenceNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/BlockReferenceNode.php rename to fluxRSS/vendor/twig/twig/src/Node/BlockReferenceNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/BodyNode.php b/fluxRSS/vendor/twig/twig/src/Node/BodyNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/BodyNode.php rename to fluxRSS/vendor/twig/twig/src/Node/BodyNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/CheckSecurityCallNode.php b/fluxRSS/vendor/twig/twig/src/Node/CheckSecurityCallNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/CheckSecurityCallNode.php rename to fluxRSS/vendor/twig/twig/src/Node/CheckSecurityCallNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/CheckSecurityNode.php b/fluxRSS/vendor/twig/twig/src/Node/CheckSecurityNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/CheckSecurityNode.php rename to fluxRSS/vendor/twig/twig/src/Node/CheckSecurityNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/CheckToStringNode.php b/fluxRSS/vendor/twig/twig/src/Node/CheckToStringNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/CheckToStringNode.php rename to fluxRSS/vendor/twig/twig/src/Node/CheckToStringNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/DeprecatedNode.php b/fluxRSS/vendor/twig/twig/src/Node/DeprecatedNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/DeprecatedNode.php rename to fluxRSS/vendor/twig/twig/src/Node/DeprecatedNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/DoNode.php b/fluxRSS/vendor/twig/twig/src/Node/DoNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/DoNode.php rename to fluxRSS/vendor/twig/twig/src/Node/DoNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/EmbedNode.php b/fluxRSS/vendor/twig/twig/src/Node/EmbedNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/EmbedNode.php rename to fluxRSS/vendor/twig/twig/src/Node/EmbedNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/AbstractExpression.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/AbstractExpression.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/AbstractExpression.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/AbstractExpression.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/ArrayExpression.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/ArrayExpression.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/ArrayExpression.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/ArrayExpression.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/ArrowFunctionExpression.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/ArrowFunctionExpression.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/ArrowFunctionExpression.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/ArrowFunctionExpression.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/AssignNameExpression.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/AssignNameExpression.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/AssignNameExpression.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/AssignNameExpression.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/AbstractBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/AbstractBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/AbstractBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/AbstractBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/AddBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/AddBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/AddBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/AddBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/AndBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/AndBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/AndBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/AndBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/BitwiseAndBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/BitwiseAndBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/BitwiseAndBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/BitwiseAndBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/BitwiseOrBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/BitwiseOrBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/BitwiseOrBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/BitwiseOrBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/BitwiseXorBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/BitwiseXorBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/BitwiseXorBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/BitwiseXorBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/ConcatBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/ConcatBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/ConcatBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/ConcatBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/DivBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/DivBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/DivBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/DivBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/EndsWithBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/EndsWithBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/EndsWithBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/EndsWithBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/EqualBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/EqualBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/EqualBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/EqualBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/FloorDivBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/FloorDivBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/FloorDivBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/FloorDivBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/GreaterBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/GreaterBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/GreaterBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/GreaterBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/GreaterEqualBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/GreaterEqualBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/GreaterEqualBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/GreaterEqualBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/HasEveryBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/HasEveryBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/HasEveryBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/HasEveryBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/HasSomeBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/HasSomeBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/HasSomeBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/HasSomeBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/InBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/InBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/InBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/InBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/LessBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/LessBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/LessBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/LessBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/LessEqualBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/LessEqualBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/LessEqualBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/LessEqualBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/MatchesBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/MatchesBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/MatchesBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/MatchesBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/ModBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/ModBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/ModBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/ModBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/MulBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/MulBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/MulBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/MulBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/NotEqualBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/NotEqualBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/NotEqualBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/NotEqualBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/NotInBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/NotInBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/NotInBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/NotInBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/OrBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/OrBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/OrBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/OrBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/PowerBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/PowerBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/PowerBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/PowerBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/RangeBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/RangeBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/RangeBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/RangeBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/SpaceshipBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/SpaceshipBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/SpaceshipBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/SpaceshipBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/StartsWithBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/StartsWithBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/StartsWithBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/StartsWithBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/SubBinary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/SubBinary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Binary/SubBinary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Binary/SubBinary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/BlockReferenceExpression.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/BlockReferenceExpression.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/BlockReferenceExpression.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/BlockReferenceExpression.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/CallExpression.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/CallExpression.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/CallExpression.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/CallExpression.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/ConditionalExpression.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/ConditionalExpression.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/ConditionalExpression.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/ConditionalExpression.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/ConstantExpression.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/ConstantExpression.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/ConstantExpression.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/ConstantExpression.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Filter/DefaultFilter.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Filter/DefaultFilter.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Filter/DefaultFilter.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Filter/DefaultFilter.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/FilterExpression.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/FilterExpression.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/FilterExpression.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/FilterExpression.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/FunctionExpression.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/FunctionExpression.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/FunctionExpression.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/FunctionExpression.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/GetAttrExpression.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/GetAttrExpression.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/GetAttrExpression.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/GetAttrExpression.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/InlinePrint.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/InlinePrint.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/InlinePrint.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/InlinePrint.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/MethodCallExpression.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/MethodCallExpression.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/MethodCallExpression.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/MethodCallExpression.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/NameExpression.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/NameExpression.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/NameExpression.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/NameExpression.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/NullCoalesceExpression.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/NullCoalesceExpression.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/NullCoalesceExpression.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/NullCoalesceExpression.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/ParentExpression.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/ParentExpression.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/ParentExpression.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/ParentExpression.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/TempNameExpression.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/TempNameExpression.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/TempNameExpression.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/TempNameExpression.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Test/ConstantTest.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Test/ConstantTest.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Test/ConstantTest.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Test/ConstantTest.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Test/DefinedTest.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Test/DefinedTest.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Test/DefinedTest.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Test/DefinedTest.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Test/DivisiblebyTest.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Test/DivisiblebyTest.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Test/DivisiblebyTest.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Test/DivisiblebyTest.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Test/EvenTest.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Test/EvenTest.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Test/EvenTest.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Test/EvenTest.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Test/NullTest.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Test/NullTest.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Test/NullTest.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Test/NullTest.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Test/OddTest.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Test/OddTest.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Test/OddTest.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Test/OddTest.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Test/SameasTest.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Test/SameasTest.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Test/SameasTest.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Test/SameasTest.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/TestExpression.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/TestExpression.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/TestExpression.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/TestExpression.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Unary/AbstractUnary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Unary/AbstractUnary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Unary/AbstractUnary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Unary/AbstractUnary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Unary/NegUnary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Unary/NegUnary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Unary/NegUnary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Unary/NegUnary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Unary/NotUnary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Unary/NotUnary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Unary/NotUnary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Unary/NotUnary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Unary/PosUnary.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/Unary/PosUnary.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/Unary/PosUnary.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/Unary/PosUnary.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/VariadicExpression.php b/fluxRSS/vendor/twig/twig/src/Node/Expression/VariadicExpression.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Expression/VariadicExpression.php rename to fluxRSS/vendor/twig/twig/src/Node/Expression/VariadicExpression.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/FlushNode.php b/fluxRSS/vendor/twig/twig/src/Node/FlushNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/FlushNode.php rename to fluxRSS/vendor/twig/twig/src/Node/FlushNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/ForLoopNode.php b/fluxRSS/vendor/twig/twig/src/Node/ForLoopNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/ForLoopNode.php rename to fluxRSS/vendor/twig/twig/src/Node/ForLoopNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/ForNode.php b/fluxRSS/vendor/twig/twig/src/Node/ForNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/ForNode.php rename to fluxRSS/vendor/twig/twig/src/Node/ForNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/IfNode.php b/fluxRSS/vendor/twig/twig/src/Node/IfNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/IfNode.php rename to fluxRSS/vendor/twig/twig/src/Node/IfNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/ImportNode.php b/fluxRSS/vendor/twig/twig/src/Node/ImportNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/ImportNode.php rename to fluxRSS/vendor/twig/twig/src/Node/ImportNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/IncludeNode.php b/fluxRSS/vendor/twig/twig/src/Node/IncludeNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/IncludeNode.php rename to fluxRSS/vendor/twig/twig/src/Node/IncludeNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/MacroNode.php b/fluxRSS/vendor/twig/twig/src/Node/MacroNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/MacroNode.php rename to fluxRSS/vendor/twig/twig/src/Node/MacroNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/ModuleNode.php b/fluxRSS/vendor/twig/twig/src/Node/ModuleNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/ModuleNode.php rename to fluxRSS/vendor/twig/twig/src/Node/ModuleNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/Node.php b/fluxRSS/vendor/twig/twig/src/Node/Node.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/Node.php rename to fluxRSS/vendor/twig/twig/src/Node/Node.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/NodeCaptureInterface.php b/fluxRSS/vendor/twig/twig/src/Node/NodeCaptureInterface.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/NodeCaptureInterface.php rename to fluxRSS/vendor/twig/twig/src/Node/NodeCaptureInterface.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/NodeOutputInterface.php b/fluxRSS/vendor/twig/twig/src/Node/NodeOutputInterface.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/NodeOutputInterface.php rename to fluxRSS/vendor/twig/twig/src/Node/NodeOutputInterface.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/PrintNode.php b/fluxRSS/vendor/twig/twig/src/Node/PrintNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/PrintNode.php rename to fluxRSS/vendor/twig/twig/src/Node/PrintNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/SandboxNode.php b/fluxRSS/vendor/twig/twig/src/Node/SandboxNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/SandboxNode.php rename to fluxRSS/vendor/twig/twig/src/Node/SandboxNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/SetNode.php b/fluxRSS/vendor/twig/twig/src/Node/SetNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/SetNode.php rename to fluxRSS/vendor/twig/twig/src/Node/SetNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/TextNode.php b/fluxRSS/vendor/twig/twig/src/Node/TextNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/TextNode.php rename to fluxRSS/vendor/twig/twig/src/Node/TextNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Node/WithNode.php b/fluxRSS/vendor/twig/twig/src/Node/WithNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Node/WithNode.php rename to fluxRSS/vendor/twig/twig/src/Node/WithNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/NodeTraverser.php b/fluxRSS/vendor/twig/twig/src/NodeTraverser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/NodeTraverser.php rename to fluxRSS/vendor/twig/twig/src/NodeTraverser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/NodeVisitor/AbstractNodeVisitor.php b/fluxRSS/vendor/twig/twig/src/NodeVisitor/AbstractNodeVisitor.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/NodeVisitor/AbstractNodeVisitor.php rename to fluxRSS/vendor/twig/twig/src/NodeVisitor/AbstractNodeVisitor.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/NodeVisitor/EscaperNodeVisitor.php b/fluxRSS/vendor/twig/twig/src/NodeVisitor/EscaperNodeVisitor.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/NodeVisitor/EscaperNodeVisitor.php rename to fluxRSS/vendor/twig/twig/src/NodeVisitor/EscaperNodeVisitor.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/NodeVisitor/MacroAutoImportNodeVisitor.php b/fluxRSS/vendor/twig/twig/src/NodeVisitor/MacroAutoImportNodeVisitor.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/NodeVisitor/MacroAutoImportNodeVisitor.php rename to fluxRSS/vendor/twig/twig/src/NodeVisitor/MacroAutoImportNodeVisitor.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/NodeVisitor/NodeVisitorInterface.php b/fluxRSS/vendor/twig/twig/src/NodeVisitor/NodeVisitorInterface.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/NodeVisitor/NodeVisitorInterface.php rename to fluxRSS/vendor/twig/twig/src/NodeVisitor/NodeVisitorInterface.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/NodeVisitor/OptimizerNodeVisitor.php b/fluxRSS/vendor/twig/twig/src/NodeVisitor/OptimizerNodeVisitor.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/NodeVisitor/OptimizerNodeVisitor.php rename to fluxRSS/vendor/twig/twig/src/NodeVisitor/OptimizerNodeVisitor.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/NodeVisitor/SafeAnalysisNodeVisitor.php b/fluxRSS/vendor/twig/twig/src/NodeVisitor/SafeAnalysisNodeVisitor.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/NodeVisitor/SafeAnalysisNodeVisitor.php rename to fluxRSS/vendor/twig/twig/src/NodeVisitor/SafeAnalysisNodeVisitor.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/NodeVisitor/SandboxNodeVisitor.php b/fluxRSS/vendor/twig/twig/src/NodeVisitor/SandboxNodeVisitor.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/NodeVisitor/SandboxNodeVisitor.php rename to fluxRSS/vendor/twig/twig/src/NodeVisitor/SandboxNodeVisitor.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Parser.php b/fluxRSS/vendor/twig/twig/src/Parser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Parser.php rename to fluxRSS/vendor/twig/twig/src/Parser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Profiler/Dumper/BaseDumper.php b/fluxRSS/vendor/twig/twig/src/Profiler/Dumper/BaseDumper.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Profiler/Dumper/BaseDumper.php rename to fluxRSS/vendor/twig/twig/src/Profiler/Dumper/BaseDumper.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Profiler/Dumper/BlackfireDumper.php b/fluxRSS/vendor/twig/twig/src/Profiler/Dumper/BlackfireDumper.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Profiler/Dumper/BlackfireDumper.php rename to fluxRSS/vendor/twig/twig/src/Profiler/Dumper/BlackfireDumper.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Profiler/Dumper/HtmlDumper.php b/fluxRSS/vendor/twig/twig/src/Profiler/Dumper/HtmlDumper.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Profiler/Dumper/HtmlDumper.php rename to fluxRSS/vendor/twig/twig/src/Profiler/Dumper/HtmlDumper.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Profiler/Dumper/TextDumper.php b/fluxRSS/vendor/twig/twig/src/Profiler/Dumper/TextDumper.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Profiler/Dumper/TextDumper.php rename to fluxRSS/vendor/twig/twig/src/Profiler/Dumper/TextDumper.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Profiler/Node/EnterProfileNode.php b/fluxRSS/vendor/twig/twig/src/Profiler/Node/EnterProfileNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Profiler/Node/EnterProfileNode.php rename to fluxRSS/vendor/twig/twig/src/Profiler/Node/EnterProfileNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Profiler/Node/LeaveProfileNode.php b/fluxRSS/vendor/twig/twig/src/Profiler/Node/LeaveProfileNode.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Profiler/Node/LeaveProfileNode.php rename to fluxRSS/vendor/twig/twig/src/Profiler/Node/LeaveProfileNode.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Profiler/NodeVisitor/ProfilerNodeVisitor.php b/fluxRSS/vendor/twig/twig/src/Profiler/NodeVisitor/ProfilerNodeVisitor.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Profiler/NodeVisitor/ProfilerNodeVisitor.php rename to fluxRSS/vendor/twig/twig/src/Profiler/NodeVisitor/ProfilerNodeVisitor.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Profiler/Profile.php b/fluxRSS/vendor/twig/twig/src/Profiler/Profile.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Profiler/Profile.php rename to fluxRSS/vendor/twig/twig/src/Profiler/Profile.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/RuntimeLoader/ContainerRuntimeLoader.php b/fluxRSS/vendor/twig/twig/src/RuntimeLoader/ContainerRuntimeLoader.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/RuntimeLoader/ContainerRuntimeLoader.php rename to fluxRSS/vendor/twig/twig/src/RuntimeLoader/ContainerRuntimeLoader.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/RuntimeLoader/FactoryRuntimeLoader.php b/fluxRSS/vendor/twig/twig/src/RuntimeLoader/FactoryRuntimeLoader.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/RuntimeLoader/FactoryRuntimeLoader.php rename to fluxRSS/vendor/twig/twig/src/RuntimeLoader/FactoryRuntimeLoader.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/RuntimeLoader/RuntimeLoaderInterface.php b/fluxRSS/vendor/twig/twig/src/RuntimeLoader/RuntimeLoaderInterface.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/RuntimeLoader/RuntimeLoaderInterface.php rename to fluxRSS/vendor/twig/twig/src/RuntimeLoader/RuntimeLoaderInterface.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Sandbox/SecurityError.php b/fluxRSS/vendor/twig/twig/src/Sandbox/SecurityError.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Sandbox/SecurityError.php rename to fluxRSS/vendor/twig/twig/src/Sandbox/SecurityError.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Sandbox/SecurityNotAllowedFilterError.php b/fluxRSS/vendor/twig/twig/src/Sandbox/SecurityNotAllowedFilterError.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Sandbox/SecurityNotAllowedFilterError.php rename to fluxRSS/vendor/twig/twig/src/Sandbox/SecurityNotAllowedFilterError.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Sandbox/SecurityNotAllowedFunctionError.php b/fluxRSS/vendor/twig/twig/src/Sandbox/SecurityNotAllowedFunctionError.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Sandbox/SecurityNotAllowedFunctionError.php rename to fluxRSS/vendor/twig/twig/src/Sandbox/SecurityNotAllowedFunctionError.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Sandbox/SecurityNotAllowedMethodError.php b/fluxRSS/vendor/twig/twig/src/Sandbox/SecurityNotAllowedMethodError.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Sandbox/SecurityNotAllowedMethodError.php rename to fluxRSS/vendor/twig/twig/src/Sandbox/SecurityNotAllowedMethodError.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Sandbox/SecurityNotAllowedPropertyError.php b/fluxRSS/vendor/twig/twig/src/Sandbox/SecurityNotAllowedPropertyError.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Sandbox/SecurityNotAllowedPropertyError.php rename to fluxRSS/vendor/twig/twig/src/Sandbox/SecurityNotAllowedPropertyError.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Sandbox/SecurityNotAllowedTagError.php b/fluxRSS/vendor/twig/twig/src/Sandbox/SecurityNotAllowedTagError.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Sandbox/SecurityNotAllowedTagError.php rename to fluxRSS/vendor/twig/twig/src/Sandbox/SecurityNotAllowedTagError.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Sandbox/SecurityPolicy.php b/fluxRSS/vendor/twig/twig/src/Sandbox/SecurityPolicy.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Sandbox/SecurityPolicy.php rename to fluxRSS/vendor/twig/twig/src/Sandbox/SecurityPolicy.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Sandbox/SecurityPolicyInterface.php b/fluxRSS/vendor/twig/twig/src/Sandbox/SecurityPolicyInterface.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Sandbox/SecurityPolicyInterface.php rename to fluxRSS/vendor/twig/twig/src/Sandbox/SecurityPolicyInterface.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Source.php b/fluxRSS/vendor/twig/twig/src/Source.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Source.php rename to fluxRSS/vendor/twig/twig/src/Source.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Template.php b/fluxRSS/vendor/twig/twig/src/Template.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Template.php rename to fluxRSS/vendor/twig/twig/src/Template.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TemplateWrapper.php b/fluxRSS/vendor/twig/twig/src/TemplateWrapper.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TemplateWrapper.php rename to fluxRSS/vendor/twig/twig/src/TemplateWrapper.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Test/IntegrationTestCase.php b/fluxRSS/vendor/twig/twig/src/Test/IntegrationTestCase.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Test/IntegrationTestCase.php rename to fluxRSS/vendor/twig/twig/src/Test/IntegrationTestCase.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Test/NodeTestCase.php b/fluxRSS/vendor/twig/twig/src/Test/NodeTestCase.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Test/NodeTestCase.php rename to fluxRSS/vendor/twig/twig/src/Test/NodeTestCase.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Token.php b/fluxRSS/vendor/twig/twig/src/Token.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Token.php rename to fluxRSS/vendor/twig/twig/src/Token.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/AbstractTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/AbstractTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/AbstractTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/AbstractTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/ApplyTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/ApplyTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/ApplyTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/ApplyTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/AutoEscapeTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/AutoEscapeTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/AutoEscapeTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/AutoEscapeTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/BlockTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/BlockTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/BlockTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/BlockTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/DeprecatedTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/DeprecatedTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/DeprecatedTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/DeprecatedTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/DoTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/DoTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/DoTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/DoTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/EmbedTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/EmbedTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/EmbedTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/EmbedTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/ExtendsTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/ExtendsTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/ExtendsTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/ExtendsTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/FlushTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/FlushTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/FlushTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/FlushTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/ForTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/ForTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/ForTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/ForTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/FromTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/FromTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/FromTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/FromTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/IfTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/IfTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/IfTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/IfTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/ImportTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/ImportTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/ImportTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/ImportTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/IncludeTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/IncludeTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/IncludeTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/IncludeTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/MacroTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/MacroTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/MacroTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/MacroTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/SandboxTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/SandboxTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/SandboxTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/SandboxTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/SetTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/SetTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/SetTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/SetTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/TokenParserInterface.php b/fluxRSS/vendor/twig/twig/src/TokenParser/TokenParserInterface.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/TokenParserInterface.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/TokenParserInterface.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/UseTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/UseTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/UseTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/UseTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/WithTokenParser.php b/fluxRSS/vendor/twig/twig/src/TokenParser/WithTokenParser.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenParser/WithTokenParser.php rename to fluxRSS/vendor/twig/twig/src/TokenParser/WithTokenParser.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TokenStream.php b/fluxRSS/vendor/twig/twig/src/TokenStream.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TokenStream.php rename to fluxRSS/vendor/twig/twig/src/TokenStream.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TwigFilter.php b/fluxRSS/vendor/twig/twig/src/TwigFilter.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TwigFilter.php rename to fluxRSS/vendor/twig/twig/src/TwigFilter.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TwigFunction.php b/fluxRSS/vendor/twig/twig/src/TwigFunction.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TwigFunction.php rename to fluxRSS/vendor/twig/twig/src/TwigFunction.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/TwigTest.php b/fluxRSS/vendor/twig/twig/src/TwigTest.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/TwigTest.php rename to fluxRSS/vendor/twig/twig/src/TwigTest.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Util/DeprecationCollector.php b/fluxRSS/vendor/twig/twig/src/Util/DeprecationCollector.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Util/DeprecationCollector.php rename to fluxRSS/vendor/twig/twig/src/Util/DeprecationCollector.php diff --git a/mvc_PSR4_twig/vendor/twig/twig/src/Util/TemplateDirIterator.php b/fluxRSS/vendor/twig/twig/src/Util/TemplateDirIterator.php similarity index 100% rename from mvc_PSR4_twig/vendor/twig/twig/src/Util/TemplateDirIterator.php rename to fluxRSS/vendor/twig/twig/src/Util/TemplateDirIterator.php diff --git a/mvc_PSR4_twig/composer.json b/mvc_PSR4_twig/composer.json deleted file mode 100755 index de876b8..0000000 --- a/mvc_PSR4_twig/composer.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "require": { - "twig/twig": "^3.0" - }, - "autoload": { - "psr-4": { - "controleur\\": "controleur/", - "config\\": "config/", - "modeles\\": "modeles/" - } - } -} diff --git a/mvc_PSR4_twig/controleur/Controleur.php b/mvc_PSR4_twig/controleur/Controleur.php deleted file mode 100755 index 8e4b61d..0000000 --- a/mvc_PSR4_twig/controleur/Controleur.php +++ /dev/null @@ -1,81 +0,0 @@ -Reinit(); - break; - - case 'validationFormulaire': - $this->ValidationFormulaire($dVueEreur); - break; - - //mauvaise action - default: - $dVueEreur[] = "Erreur d'appel php"; - echo $twig->render('vuephp1.html', ['dVueEreur' => $dVueEreur]); - break; - } - } catch (\PDOException $e) { - //si erreur BD, pas le cas ici - $dVueEreur[] = 'Erreur inattendue!!! '; - } catch (\Exception $e2) { - $dVueEreur[] = 'Erreur inattendue!!! '; - echo $twig->render('erreur.html', ['dVueEreur' => $dVueEreur]); - } - - //fin - exit(0); - }//fin constructeur - - public function Reinit() - { - global $twig; // nécessaire pour utiliser variables globales - - $dVue = [ - 'nom' => '', - 'age' => 0, - ]; - echo $twig->render('vuephp1.html', [ - 'dVue' => $dVue - ]); - } - - public function ValidationFormulaire(array $dVueEreur) - { - global $twig; // nécessaire pour utiliser variables globales - - //si exception, ca remonte !!! - $nom = $_POST['txtNom']; // txtNom = nom du champ texte dans le formulaire - $age = $_POST['txtAge']; - \config\Validation::val_form($nom, $age, $dVueEreur); - - $model = new \modeles\Simplemodel(); - $data = $model->get_data(); - - $dVue = [ - 'nom' => $nom, - 'age' => $age, - 'data' => $data, - ]; - - echo $twig->render('vuephp1.html', ['dVue' => $dVue, 'dVueEreur' => $dVueEreur]); - } -}//fin class diff --git a/mvc_PSR4_twig/modeles/Simplemodel.php b/mvc_PSR4_twig/modeles/Simplemodel.php deleted file mode 100755 index 277c591..0000000 --- a/mvc_PSR4_twig/modeles/Simplemodel.php +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - Personne - formulaire - - - - - - {% if dVue is defined %} -
- {% if dVueEreur is defined and dVueEreur|length >0 %} -

ERREUR !!!!!

- {% for value in dVueEreur %} -

{{value}}

- {% endfor %} - {% endif %} - -

Personne - formulaire

-
- - {{dVue.data}} - -
- - - - - - - - - - -
Nom - -
Age - -
- - - - - - -
- -
- - -
-
- {% else %} -

Erreur !!
utilisation anormale de la vuephp

- {% endif %} -

- Essayez de mettre du code html dans nom -> Correspond à une attaque de type injection -

- -