Acksop/SAND-framework
1
0
Fork 0
Code Issues Pull requests Projects 1 Releases Packages Wiki Activity

update php-cs-fixer

Browse source
This commit is contained in:
Emmanuel ROY 2020-12-09 10:26:26 +01:00
commit 46f300f890
140 changed files with 1703 additions and 1251 deletions
Download patch file Download diff file Expand all files Collapse all files

2
console/bin.php
View file

@ -24,4 +24,4 @@ if (isset($argv[1])) {
}
} else {
print "No command was specified !\n";
}
}

13
console/command/Cache.php
View file

@ -4,12 +4,13 @@ namespace MVC\Command;
class Cache
{
static public function help(){
public static function help()
{
print "explaination of the command\n\n";
}
static public function clear(){
public static function clear()
{
$git_cache_rm = system('rm -f '.VIEW_PATH.'/cache/*', $git_cache_rm_retval);
print $git_cache_rm_retval;
$git_logs_rm = system('rm -f '.LOG_PATH.'/*', $git_logs_rm_retval);
@ -18,10 +19,10 @@ class Cache
print "logs && cache cleared ! \n\n";
}
static public function stabilize(){
public static function stabilize()
{
$git_cache_rm = system('rm -f '.VIEW_PATH.'/cache/*', $git_cache_rm_retval);
print $git_cache_rm_retval;
print "cache stabilized ! \n\n";
}
}
}

158
console/command/Module.php
View file

@ -4,66 +4,68 @@ namespace MVC\Command;
class Module
{
static public function help(){
public static function help()
{
print "explaination of the command\n\n";
}
static public function add(){
public static function add()
{
print "adding module...\n\n";
print "Quel est le module a ajouter ?\n1.Symfony\n2.Wordpress\n3.Prestashop\n4.PhpList\n5.Wanewsletter\n6.PHPmyNewletter\n>";
$module = trim(fgets(STDIN));
switch($module){
switch ($module) {
case 1:
print "Quel est le nom du module symfony à ajouter (default : symfony) ? ";
$name = trim(fgets(STDIN));
if($name !== '' && preg_match('#(.)+#',$name)){
if ($name !== '' && preg_match('#(.)+#', $name)) {
Module::addSymfony($name);
}else{
} else {
Module::addSymfony('symfony');
}
break;
case 2:
print "Quel est la version de Wordpress à ajouter (default : 5.4) ? ";
$version = trim(fgets(STDIN));
if($version !== '' && preg_match('#(.)\.(.)#',$version)){
if ($version !== '' && preg_match('#(.)\.(.)#', $version)) {
Module::addWordpress($version);
}else{
} else {
Module::addWordpress('5.4');
}
break;
case 3:
print "Quel est la version de Prestashop à ajouter (default : 1.7.5.0) ? ";
$version = trim(fgets(STDIN));
if($version !== '' && preg_match('#(.)\.(.)\.(.)\.(.)#',$version)){
if ($version !== '' && preg_match('#(.)\.(.)\.(.)\.(.)#', $version)) {
Module::addPrestashop($version);
}else{
} else {
Module::addPrestashop('1.7.5.0');
}
break;
case 4:
print "Quel est la version de PhpList à ajouter (default : 3.5.2) ? ";
$version = trim(fgets(STDIN));
if($version !== '' && preg_match('#(.)\.(.)\.(.)#',$version)){
if ($version !== '' && preg_match('#(.)\.(.)\.(.)#', $version)) {
Module::addPhplist($version);
}else{
} else {
Module::addPhplist('3.5.2');
}
break;
case 5:
print "Quel est la version de Wanewletter à ajouter (default : release-3.0.1) ? ";
$version = trim(fgets(STDIN));
if($version !== '' && preg_match('#(.)\.(.)\.(.)#',$version)){
if ($version !== '' && preg_match('#(.)\.(.)\.(.)#', $version)) {
Module::addWanewsletter($version);
}else{
} else {
Module::addWanewsletter('release-3.0.1');
}
break;
case 6:
print "Quel est la version de PHPmyNewletter à ajouter (default : v2.0.5) ? ";
$version = trim(fgets(STDIN));
if($version !== '' && preg_match('#(.)\.(.)\.(.)#',$version)){
if ($version !== '' && preg_match('#(.)\.(.)\.(.)#', $version)) {
Module::addPHPMyNewsletter($version);
}else{
} else {
Module::addPHPMyNewsletter('v2.0.5');
}
break;
@ -71,17 +73,18 @@ class Module
}
}
static public function remove(){
public static function remove()
{
print "removing module...\n\n";
print "Quel est le module a supprimer?\n1.Symfony\n2.Wordpress\n3.Prestashop\n4.PhpList\n5.Wanewsletter\n6.PHPmyNewletter\n>";
$module = trim(fgets(STDIN));
switch($module){
switch ($module) {
case 1:
print "Quel est le nom du module symfony à supprimer (default : symfony) ? ";
$name = trim(fgets(STDIN));
if($name !== '' && preg_match('#(.)+#',$name)){
if ($name !== '' && preg_match('#(.)+#', $name)) {
Module::removeSymfony($name);
}else{
} else {
Module::removeSymfony('symfony');
}
break;
@ -104,8 +107,8 @@ class Module
}
}
static private function addSymfony($name = 'symfony'){
private static function addSymfony($name = 'symfony')
{
$git_clone = shell_exec('cd '.MODULES_PATH.' && composer create-project symfony/website-skeleton '.$name);
print $git_clone;
$git_chmod = shell_exec('sudo chmod 775 '.MODULES_PATH.'/'.$name.' -R');
@ -114,17 +117,17 @@ class Module
print $git_chown;
$git_controlleur = shell_exec('cp '.CONSOLE_PATH.'/skel/module_symfony.php '.CONTROLLERS_PATH.'/'.$name.'.php');
$controlleur = file_get_contents(CONTROLLERS_PATH.'/'.$name.'.php');
$controlleur = preg_replace('%MODULE%',$name,$controlleur);
$controlleur = preg_replace('%MODULE%', $name, $controlleur);
file_put_contents(CONTROLLERS_PATH.'/'.$name.'.php', $controlleur);
print $git_controlleur;
$git_modele = shell_exec('cp '.CONSOLE_PATH.'/skel/module.model '.MODELS_PATH.'/'.$name.'.model');
$modele = file_get_contents(MODELS_PATH.'/'.$name.'.model');
$modele = preg_replace('%MODULE%',$name,$modele);
$modele = preg_replace('%MODULE%', $name, $modele);
file_put_contents(MODELS_PATH.'/'.$name.'.model', $modele);
print $git_modele;
$git_view = shell_exec('cp '.CONSOLE_PATH.'/skel/module.blade.php '.VIEW_PATH.'/view/'.$name.'.blade.php');
$vue = file_get_contents(VIEW_PATH.'/view/'.$name.'.blade.php');
$vue = preg_replace('%MODULE%','symfony',$vue);
$vue = preg_replace('%MODULE%', 'symfony', $vue);
file_put_contents(VIEW_PATH.'/view/'.$name.'.blade.php', $vue);
print $git_view;
@ -141,10 +144,9 @@ class Module
."\n'.$name.' : Application permettant d'intégrer un module avec symfony"
."\n "
."\n et de créer la base de données!\n";
}
static public function removeSymfony($name = 'symfony'){
public static function removeSymfony($name = 'symfony')
{
$git_clone = system('rm -Rf '.MODULES_PATH.'/'.$name, $git_clone_retval);
print $git_clone_retval;
$git_ln_1 = system('rm -Rf '.PUBLIC_PATH.'/'.$name, $git_ln_1_retval);
@ -157,8 +159,8 @@ class Module
print $git_view_retval;
}
static public function addWordpress($version = '5.4'){
public static function addWordpress($version = '5.4')
{
$git_clone = shell_exec('cd '.MODULES_PATH.' && git clone https://github.com/WordPress/WordPress.git wordpress');
print $git_clone;
$git_fetch = shell_exec('cd '.MODULES_PATH.'/wordpress && git fetch --all --tags');
@ -172,21 +174,21 @@ class Module
$git_ln_1 = shell_exec('cd '.PUBLIC_PATH.' && ln -s ../application/modules/wordpress/ wordpress');
print $git_ln_1;
$languages = shell_exec('cp '.CONSOLE_PATH.'/skel/wordpress '.MODULES_PATH );
$languages = shell_exec('cp '.CONSOLE_PATH.'/skel/wordpress '.MODULES_PATH);
$git_controlleur = shell_exec('cp '.CONSOLE_PATH.'/skel/module.php '.CONTROLLERS_PATH.'/wordpress.php');
$controlleur = file_get_contents(CONTROLLERS_PATH.'/wordpress.php');
$controlleur = preg_replace('%MODULE%','wordpress',$controlleur);
$controlleur = preg_replace('%MODULE%', 'wordpress', $controlleur);
file_put_contents(CONTROLLERS_PATH.'/wordpress.php', $controlleur);
print $git_controlleur;
$git_modele = shell_exec('cp '.CONSOLE_PATH.'/skel/module.model '.MODELS_PATH.'/wordpress.model');
$modele = file_get_contents(MODELS_PATH.'/wordpress.model');
$modele = preg_replace('%MODULE%','wordpress',$modele);
$modele = preg_replace('%MODULE%', 'wordpress', $modele);
file_put_contents(MODELS_PATH.'/wordpress.model', $modele);
print $git_modele;
$git_view = shell_exec('cp '.CONSOLE_PATH.'/skel/module.blade.php '.VIEW_PATH.'/view/wordpress.blade.php');
$vue = file_get_contents(VIEW_PATH.'/view/wordpress.blade.php');
$vue = preg_replace('%MODULE%','wordpress',$vue);
$vue = preg_replace('%MODULE%', 'wordpress', $vue);
file_put_contents(VIEW_PATH.'/view/wordpress.blade.php', $vue);
print $git_view;
@ -194,10 +196,9 @@ class Module
."\nwordpress : Application permettant de générer un blog wordpress"
."\n "
."\n et de créer la base de données!\n";
}
static public function removeWordpress(){
public static function removeWordpress()
{
$git_clone = system('sudo rm -Rf '.MODULES_PATH.'/wordpress', $git_clone_retval);
print $git_clone_retval;
$git_ln_1 = system('rm -Rf '.PUBLIC_PATH.'/wordpress', $git_ln_1_retval);
@ -210,8 +211,8 @@ class Module
print $git_view_retval;
}
static public function addPrestashop($version = '1.7.5.0'){
public static function addPrestashop($version = '1.7.5.0')
{
$git_clone = shell_exec('cd '.MODULES_PATH.' && git clone https://github.com/PrestaShop/PrestaShop.git prestashop');
print $git_clone;
$git_fetch = shell_exec('cd '.MODULES_PATH.'/prestashop && git fetch --all --tags');
@ -230,17 +231,17 @@ class Module
print $git_ln_2;
$git_controlleur = shell_exec('cp '.CONSOLE_PATH.'/skel/module.php '.CONTROLLERS_PATH.'/prestashop.php');
$controlleur = file_get_contents(CONTROLLERS_PATH.'/prestashop.php');
$controlleur = preg_replace('%MODULE%','prestashop',$controlleur);
$controlleur = preg_replace('%MODULE%', 'prestashop', $controlleur);
file_put_contents(CONTROLLERS_PATH.'/prestashop.php', $controlleur);
print $git_controlleur;
$git_modele = shell_exec('cp '.CONSOLE_PATH.'/skel/module.model '.MODELS_PATH.'/prestashop.model');
$controlleur = file_get_contents(MODELS_PATH.'/prestashop.model');
$controlleur = preg_replace('%MODULE%','prestashop',$controlleur);
$controlleur = preg_replace('%MODULE%', 'prestashop', $controlleur);
file_put_contents(MODELS_PATH.'/prestashop.model', $controlleur);
print $git_modele;
$git_view = shell_exec('cp '.CONSOLE_PATH.'/skel/module.blade.php '.VIEW_PATH.'/view/prestashop.blade.php');
$controlleur = file_get_contents(VIEW_PATH.'/view/prestashop.blade.php');
$controlleur = preg_replace('%MODULE%','prestashop',$controlleur);
$controlleur = preg_replace('%MODULE%', 'prestashop', $controlleur);
file_put_contents(VIEW_PATH.'/view/prestashop.blade.php', $controlleur);
print $git_view;
@ -249,8 +250,8 @@ class Module
."\n "
."\n et de créer la base de données!\n";
}
static public function removePrestashop(){
public static function removePrestashop()
{
$git_clone = system('rm -Rf '.MODULES_PATH.'/prestashop', $git_clone_retval);
print $git_clone_retval;
$git_ln_1 = system('rm -Rf '.PUBLIC_PATH.'/prestashop', $git_ln_1_retval);
@ -263,7 +264,8 @@ class Module
print $git_view_retval;
}
static public function addPhplist($version = '3.5.2'){
public static function addPhplist($version = '3.5.2')
{
/*$git_clone = shell_exec('cd '.MODULES_PATH.' && git clone https://github.com/phpList/phplist3.git phplist');
print $git_clone;
@ -290,65 +292,65 @@ class Module
print $git_chown;
$git_controlleur = shell_exec('cp '.CONSOLE_PATH.'/skel/module.php '.CONTROLLERS_PATH.'/phplist.php');
$controlleur = file_get_contents(CONTROLLERS_PATH.'/phplist.php');
$controlleur = preg_replace('%MODULE%','phplist',$controlleur);
$controlleur = preg_replace('%MODULE%', 'phplist', $controlleur);
file_put_contents(CONTROLLERS_PATH.'/phplist.php', $controlleur);
print $git_controlleur;
$git_modele = shell_exec('cp '.CONSOLE_PATH.'/skel/module.model '.MODELS_PATH.'/phplist.model');
$controlleur = file_get_contents(MODELS_PATH.'/phplist.model');
$controlleur = preg_replace('%MODULE%','phplist',$controlleur);
$controlleur = preg_replace('%MODULE%', 'phplist', $controlleur);
file_put_contents(MODELS_PATH.'/phplist.model', $controlleur);
print $git_modele;
$git_view = shell_exec('cp '.CONSOLE_PATH.'/skel/module.blade.php '.VIEW_PATH.'/view/phplist.blade.php');
$controlleur = file_get_contents(VIEW_PATH.'/view/phplist.blade.php');
$controlleur = preg_replace('%MODULE%','phplist',$controlleur);
$controlleur = preg_replace('%MODULE%', 'phplist', $controlleur);
file_put_contents(VIEW_PATH.'/view/phplist.blade.php', $controlleur);
print $git_view;
print "Quel est le host de la base de donnees (default:192.168.1.70) ? ";
$host = trim(fgets(STDIN));
if($host !== '' && preg_match('#(.)+#',$host)){
if ($host !== '' && preg_match('#(.)+#', $host)) {
$host = $host;
}else{
} else {
$host = '192.168.1.70';
}
print "Quel est le nom de la base de donnees (default:SAND_phplist) ? ";
$host_name = trim(fgets(STDIN));
if($host_name !== '' && preg_match('#(.)+#',$host_name)){
if ($host_name !== '' && preg_match('#(.)+#', $host_name)) {
$host_name = $host_name;
}else{
} else {
$host_name = 'SAND_phplist';
}
print "Quel est le user de la base de donnees (default:sand) ? ";
$user = trim(fgets(STDIN));
if($user !== '' && preg_match('#(.)+#',$user)){
if ($user !== '' && preg_match('#(.)+#', $user)) {
$user = $user;
}else{
} else {
$user = 'sand';
}
print "Quel est le pass de la base de donnees (default:sand) ? ";
$pass = trim(fgets(STDIN));
if($pass !== '' && preg_match('#(.)+#',$pass)){
if ($pass !== '' && preg_match('#(.)+#', $pass)) {
$pass = $pass;
}else{
} else {
$pass = 'sand';
}
$config_skel = shell_exec('cp '.CONSOLE_PATH.'/skel/phplist/config.skel.php '.MODULES_PATH.'/phplist/public_html/lists/config/config.php');
$config = file_get_contents(MODULES_PATH.'/phplist/public_html/lists/config/config.php');
$config = preg_replace('%HOST_HOSTNAME%',$host,$config);
$config = preg_replace('%HOST_USERNAME%',$user,$config);
$config = preg_replace('%HOST_NAME%',$host_name,$config);
$config = preg_replace('%HOST_PASSWORD%',$pass,$config);
$config = preg_replace('%HOST_PAGEROOT%','/phplist',$config);
file_put_contents(MODULES_PATH.'/phplist/public_html/lists/config/config.php',$config);
$config = preg_replace('%HOST_HOSTNAME%', $host, $config);
$config = preg_replace('%HOST_USERNAME%', $user, $config);
$config = preg_replace('%HOST_NAME%', $host_name, $config);
$config = preg_replace('%HOST_PASSWORD%', $pass, $config);
$config = preg_replace('%HOST_PAGEROOT%', '/phplist', $config);
file_put_contents(MODULES_PATH.'/phplist/public_html/lists/config/config.php', $config);
print "\n\nN'oubliez pas d'ajouter au fichier '/application/modules/setup/registre.model' :"
."\nphplist : Application permettant de générer une newsletter phplist"
."\n "
."\n et de créer la base de données!\n";
}
static public function removePhplist(){
public static function removePhplist()
{
$git_clone = system('rm -Rf '.MODULES_PATH.'/phplist', $git_clone_retval);
print $git_clone_retval;
$git_ln_1 = system('rm -Rf '.PUBLIC_PATH.'/phplist', $git_ln_1_retval);
@ -362,8 +364,8 @@ class Module
$git_view = system('rm -f '.VIEW_PATH.'/view/phplist.blade.php', $git_view_retval);
print $git_view_retval;
}
static public function addWanewsletter($version = 'release-3.0.1'){
public static function addWanewsletter($version = 'release-3.0.1')
{
$git_clone = shell_exec('cd '.MODULES_PATH.' && git clone https://github.com/wascripts/wanewsletter.git wanewsletter');
print $git_clone;
$git_fetch = shell_exec('cd '.MODULES_PATH.'/wanewsletter && git fetch --all --tags');
@ -380,17 +382,17 @@ class Module
print $git_chown;
$git_controlleur = shell_exec('cp '.CONSOLE_PATH.'/skel/module.php '.CONTROLLERS_PATH.'/wanewsletter.php');
$controlleur = file_get_contents(CONTROLLERS_PATH.'/wanewsletter.php');
$controlleur = preg_replace('%MODULE%','wanewsletter',$controlleur);
$controlleur = preg_replace('%MODULE%', 'wanewsletter', $controlleur);
file_put_contents(CONTROLLERS_PATH.'/wanewsletter.php', $controlleur);
print $git_controlleur;
$git_modele = shell_exec('cp '.CONSOLE_PATH.'/skel/module.model '.MODELS_PATH.'/wanewsletter.model');
$controlleur = file_get_contents(MODELS_PATH.'/wanewsletter.model');
$controlleur = preg_replace('%MODULE%','wanewsletter',$controlleur);
$controlleur = preg_replace('%MODULE%', 'wanewsletter', $controlleur);
file_put_contents(MODELS_PATH.'/wanewsletter.model', $controlleur);
print $git_modele;
$git_view = shell_exec('cp '.CONSOLE_PATH.'/skel/module.blade.php '.VIEW_PATH.'/view/wanewsletter.blade.php');
$controlleur = file_get_contents(VIEW_PATH.'/view/wanewsletter.blade.php');
$controlleur = preg_replace('%MODULE%','wanewsletter',$controlleur);
$controlleur = preg_replace('%MODULE%', 'wanewsletter', $controlleur);
file_put_contents(VIEW_PATH.'/view/wanewsletter.blade.php', $controlleur);
print $git_view;
@ -437,8 +439,8 @@ class Module
."\n "
."\n et de créer la base de données!\n";
}
static public function removeWanewsletter(){
public static function removeWanewsletter()
{
$git_clone = system('rm -Rf '.MODULES_PATH.'/wanewsletter', $git_clone_retval);
print $git_clone_retval;
$git_ln_1 = system('rm -Rf '.PUBLIC_PATH.'/wanewsletter', $git_ln_1_retval);
@ -450,8 +452,8 @@ class Module
$git_view = system('rm -f '.VIEW_PATH.'/view/wanewsletter.blade.php', $git_view_retval);
print $git_view_retval;
}
static public function addPHPMyNewsletter($version = 'v2.0.5'){
public static function addPHPMyNewsletter($version = 'v2.0.5')
{
$git_clone = shell_exec('cd '.MODULES_PATH.' && git clone https://github.com/Arnaud69/phpmynewsletter-2.0.git phpmynewsletter');
print $git_clone;
$git_fetch = shell_exec('cd '.MODULES_PATH.'/phpmynewsletter && git fetch --all --tags');
@ -468,17 +470,17 @@ class Module
print $git_chown;
$git_controlleur = shell_exec('cp '.CONSOLE_PATH.'/skel/module.php '.CONTROLLERS_PATH.'/phpmynewsletter.php');
$controlleur = file_get_contents(CONTROLLERS_PATH.'/phpmynewsletter.php');
$controlleur = preg_replace('%MODULE%','phpmynewsletter',$controlleur);
$controlleur = preg_replace('%MODULE%', 'phpmynewsletter', $controlleur);
file_put_contents(CONTROLLERS_PATH.'/phpmynewsletter.php', $controlleur);
print $git_controlleur;
$git_modele = shell_exec('cp '.CONSOLE_PATH.'/skel/module.model '.MODELS_PATH.'/phpmynewsletter.model');
$controlleur = file_get_contents(MODELS_PATH.'/phpmynewsletter.model');
$controlleur = preg_replace('%MODULE%','phpmynewsletter',$controlleur);
$controlleur = preg_replace('%MODULE%', 'phpmynewsletter', $controlleur);
file_put_contents(MODELS_PATH.'/phpmynewsletter.model', $controlleur);
print $git_modele;
$git_view = shell_exec('cp '.CONSOLE_PATH.'/skel/module.blade.php '.VIEW_PATH.'/view/phpmynewsletter.blade.php');
$controlleur = file_get_contents(VIEW_PATH.'/view/phpmynewsletter.blade.php');
$controlleur = preg_replace('%MODULE%','phpmynewsletter',$controlleur);
$controlleur = preg_replace('%MODULE%', 'phpmynewsletter', $controlleur);
file_put_contents(VIEW_PATH.'/view/phpmynewsletter.blade.php', $controlleur);
print $git_view;
@ -525,8 +527,8 @@ class Module
."\n "
."\n et de créer la base de données!\n";
}
static public function removePHPMyNewsletter(){
public static function removePHPMyNewsletter()
{
$git_clone = system('rm -Rf '.MODULES_PATH.'/phpmynewsletter', $git_clone_retval);
print $git_clone_retval;
$git_ln_1 = system('rm -Rf '.PUBLIC_PATH.'/phpmynewsletter', $git_ln_1_retval);
@ -538,4 +540,4 @@ class Module
$git_view = system('rm -f '.VIEW_PATH.'/view/phpmynewsletter.blade.php', $git_view_retval);
print $git_view_retval;
}
}
}

21
console/command/Page.php
View file

@ -4,37 +4,39 @@ namespace MVC\Command;
class Page
{
static public function help(){
public static function help()
{
print "explaination of the command\n\n";
}
static public function add(){
public static function add()
{
print "adding page...\n\n";
print "Quel est le nom de la page a ajouter? ";
$page = trim(fgets(STDIN));
$git_controlleur = shell_exec('cp '.CONSOLE_PATH.'/skel/page.php '.CONTROLLERS_PATH.'/'.$page.'.php');
$controlleur = file_get_contents(CONTROLLERS_PATH.'/'.$page.'.php');
$controlleur = preg_replace('%PAGE%',$page,$controlleur);
$controlleur = preg_replace('%PAGE%', $page, $controlleur);
file_put_contents(CONTROLLERS_PATH.'/'.$page.'.php', $controlleur);
print $git_controlleur;
$git_modele = shell_exec('cp '.CONSOLE_PATH.'/skel/page.model '.MODELS_PATH.'/'.$page.'.model');
$controlleur = file_get_contents(MODELS_PATH.'/'.$page.'.model');
$controlleur = preg_replace('%PAGE%',$page,$controlleur);
$controlleur = preg_replace('%PAGE%', $page, $controlleur);
file_put_contents(MODELS_PATH.'/'.$page.'.model', $controlleur);
print $git_modele;
$git_view = shell_exec('cp '.CONSOLE_PATH.'/skel/page.blade.php '.VIEW_PATH.'/view/'.$page.'.blade.php');
$controlleur = file_get_contents(VIEW_PATH.'/view/'.$page.'.blade.php');
$controlleur = preg_replace('%PAGE%',$page,$controlleur);
$controlleur = preg_replace('%PAGE%', $page, $controlleur);
file_put_contents(VIEW_PATH.'/view/'.$page.'.blade.php', $controlleur);
print $git_view;
}
static public function remove(){
public static function remove()
{
print "removing page...\n\n";
print "Quel est le nom de la page a supprimer? ";
$handle = fopen ("php://stdin","r");
$handle = fopen("php://stdin", "r");
$page = fgets($handle);
$git_controlleur = system('rm -f '.CONTROLLERS_PATH.'/'.$page.'.php', $git_controlleur_retval);
print $git_controlleur_retval;
@ -43,5 +45,4 @@ class Page
$git_view = system('rm -f '.VIEW_PATH.'/view/'.$page.'.blade.php', $git_view_retval);
print $git_view_retval;
}
}
}

10
console/command/Symfony.php
View file

@ -4,14 +4,14 @@ namespace MVC\Command;
class Symfony
{
static public function help(){
public static function help()
{
print "explaination of the command\n\n";
}
static public function stabilize(){
public static function stabilize()
{
print "stabilize symfony module...\n\n";
$symfony_module = shell_exec('sudo cp '.CONSOLE_PATH.'/skel/symfony '.VENDOR_PATH.' -Rf');
}
}
}

4
console/skel/module.php
View file

@ -1,3 +1,3 @@
<?php
$app = new MVC\Classe\Modular($name,'MODULE',$url_params);
$templateData = array('app' => $app);
$app = new MVC\Classe\Modular($name, 'MODULE', $url_params);
$templateData = array('app' => $app);

4
console/skel/module_symfony.php
View file

@ -3,5 +3,5 @@
use MVC\Classe\Session;
Session::start();
$app = new MVC\Classe\Modular($name,'MODULE',$url_params);
$templateData = array('app' => $app);
$app = new MVC\Classe\Modular($name, 'MODULE', $url_params);
$templateData = array('app' => $app);

2
console/skel/page.php
View file

@ -4,4 +4,4 @@
use MVC\Classe\Logger;
$templateData = array("templating_a"=>'blade',"templating_b"=>'twig',"templating_c"=>'edge');
Logger::addLog('ok', 'Hello world');
Logger::addLog('ok', 'Hello world');

2
console/skel/phplist/config.skel.php
View file

@ -663,7 +663,7 @@ define('UPLOADIMAGES_DIR', 'uploadimages');
// EMBEDEXTERNALIMAGES
// this flag will fetch images in your content that are remotely hosted and put them
// inside the message that is sent.
define('EMBEDEXTERNALIMAGES',false);
define('EMBEDEXTERNALIMAGES', false);
// Manual text part, will give you an input box for the text version of the message

1
console/skel/symfony-app/src/Controller/AdminController.php
View file

@ -1,6 +1,7 @@
<?php
namespace App\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Routing\Annotation\Route;

5
console/skel/symfony-app/src/Controller/DefaultController.php
View file

@ -1,6 +1,7 @@
<?php
namespace App\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Routing\Annotation\Route;
@ -11,8 +12,8 @@ class DefaultController extends AbstractController
*/
public function indexAction()
{
print_r("<pre>");
//print_r($this->get('session'));
print_r("<pre>");
//print_r($this->get('session'));
print_r($_COOKIE);
print_r($_SESSION);
print_r("</pre>");

5
console/skel/symfony-app/src/Controller/ErrorController.php
View file

@ -1,6 +1,7 @@
<?php
namespace App\Controller;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Routing\Annotation\Route;
@ -11,8 +12,8 @@ class ErrorController extends AbstractController
*/
public function indexAction()
{
print_r("<pre>");
//print_r($this->get('session'));
print_r("<pre>");
//print_r($this->get('session'));
print_r($_COOKIE);
print_r($_SESSION);
print_r("</pre>");

21
console/skel/symfony-app/src/Events/OnAuthenticationFailureEvent.php
View file

@ -7,32 +7,35 @@ use Symfony\Component\Security\Core\Exception\AuthenticationException;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
class OnAuthenticationFailureEvent extends Event {
class OnAuthenticationFailureEvent extends Event
{
const NAME = "session_auth.event.on_authentication_failure";
public function __construct(Request $request, AuthenticationException $exception) {
public function __construct(Request $request, AuthenticationException $exception)
{
$this->request = $request;
$this->exception = $exception;
$this->response = new Response($exception->getMessage(), Response::HTTP_FORBIDDEN);
}
public function getRequest() {
public function getRequest()
{
return $this->request;
}
public function getException() {
public function getException()
{
return $this->exception;
}
public function getResponse() {
public function getResponse()
{
return $this->response;
}
public function setResponse($response) {
public function setResponse($response)
{
$this->response = $response;
return $this;
}
}

18
console/skel/symfony-app/src/Events/OnAuthenticationSuccessEvent.php
View file

@ -5,27 +5,29 @@ use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\HttpFoundation\Request;
class OnAuthenticationSuccessEvent extends Event {
class OnAuthenticationSuccessEvent extends Event
{
const NAME = "session_auth.event.on_authentication_success";
public function __construct(Request $request, TokenInterface $token, $providerKey) {
public function __construct(Request $request, TokenInterface $token, $providerKey)
{
$this->request = $request;
$this->token = $token;
$this->providerKey = $providerKey;
}
public function getRequest() {
public function getRequest()
{
return $this->request;
}
public function getToken() {
public function getToken()
{
return $this->exception;
}
public function getProviderKey() {
public function getProviderKey()
{
return $this->providerKey;
}
}

5
console/skel/symfony-app/src/Security/AccessDeniedHandler.php
View file

@ -18,9 +18,10 @@ class AccessDeniedHandler implements AccessDeniedHandlerInterface
public function handle(Request $request, AccessDeniedException $accessDeniedException)
{
$content = $this->twig->render(
'default/unauthorized.html.twig', array()
'default/unauthorized.html.twig',
array()
);
$response = new Response($content, Response::HTTP_FORBIDDEN);
return $response;
}
}
}

14
console/skel/symfony-app/src/Security/AuthUser.php
View file

@ -4,8 +4,8 @@ namespace App\Security;
use Symfony\Component\Security\Core\User\UserInterface;
class AuthUser implements UserInterface{
class AuthUser implements UserInterface
{
private $id;
private $username;
private $status;
@ -14,7 +14,7 @@ class AuthUser implements UserInterface{
private $credentials;
private $roles = [];
public function __construct($id, $username,$credentials, array $roles = [])
public function __construct($id, $username, $credentials, array $roles = [])
{
$this->username = $username;
$this->id = $id;
@ -27,7 +27,7 @@ class AuthUser implements UserInterface{
{
$roles = $this->roles;
// guarantee every user at least has ROLE_USER
if($this->getId() == 1587184) {
if ($this->getId() == 1587184) {
$roles[] = 'ROLE_ADMIN';
}
return array_unique($roles);
@ -43,7 +43,8 @@ class AuthUser implements UserInterface{
return $this->username;
}
public function getUser(){
public function getUser()
{
return $this;
}
@ -93,5 +94,4 @@ class AuthUser implements UserInterface{
return true;
}
}
}

16
console/skel/symfony-app/src/Security/AuthUserProvider.php
View file

@ -9,7 +9,6 @@ use Symfony\Component\Security\Core\Exception\UsernameNotFoundException;
use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\Security\Core\User\UserProviderInterface;
class AuthUserProvider implements UserProviderInterface
{
@ -24,16 +23,17 @@ class AuthUserProvider implements UserProviderInterface
*
* @throws UsernameNotFoundException if the user is not found
*/
public function loadUserByUsername($username) {
public function loadUserByUsername($username)
{
$entity_user = $this->entity_user;
return $this->authService->getUser($username);
// Load a User object from your data source or throw UsernameNotFoundException.
// Load a User object from your data source or throw UsernameNotFoundException.
// The $username argument may not actually be a username:
// it is whatever value is being returned by the getUsername()
// method in your User class.
// throw new \Exception('TODO: fill in loadUserByUsername() inside '.__FILE__);
}
}
/**
* Refreshes the user after being reloaded from the session.
@ -49,13 +49,15 @@ class AuthUserProvider implements UserProviderInterface
* @return UserInterface
*/
public function refreshUser(UserInterface $user) {
public function refreshUser(UserInterface $user)
{
$user = $this->_ctrlInstanceUser($user);
return $this->loadUserByUsername($user->getUsername());
}
private function _ctrlInstanceUser(UserInterface $user) {
private function _ctrlInstanceUser(UserInterface $user)
{
$entity_user = $this->entity_user;
if (!$user instanceof $entity_user) {
@ -74,4 +76,4 @@ class AuthUserProvider implements UserProviderInterface
{
return AuthUser::class === $class;
}
}
}

30
console/skel/symfony-app/src/Security/SessionAuthenticator.php
View file

@ -17,13 +17,12 @@ use Symfony\Component\Security\Core\User\UserProviderInterface;
use Symfony\Component\Security\Guard\AbstractGuardAuthenticator;
use Twig\Environment;
class SessionAuthenticator extends AbstractGuardAuthenticator
{
public $router;
public $twig;
public function __construct(UrlGeneratorInterface $router,Environment $twig)
public function __construct(UrlGeneratorInterface $router, Environment $twig)
{
$this->router = $router;
$this->twig = $twig;
@ -40,7 +39,7 @@ class SessionAuthenticator extends AbstractGuardAuthenticator
Dumper::dump($_SESSION);
if (isset($_SESSION['id_utilisateur'])) {
return true;
}else{
} else {
return true;
}
}
@ -59,8 +58,8 @@ class SessionAuthenticator extends AbstractGuardAuthenticator
{
Dumper::dump("getUser");
if (!isset($_SESSION['id'])) {
$user = new \App\Security\AuthUser('0','not-connected',$credentials,['ROLE_USER']);
}else {
$user = new \App\Security\AuthUser('0', 'not-connected', $credentials, ['ROLE_USER']);
} else {
$user = new \App\Security\AuthUser($_SESSION['id'], $_SESSION['username'], $credentials, ['ROLE_USER', 'ROLE_USER_CONNECTED']);
}
@ -77,9 +76,9 @@ class SessionAuthenticator extends AbstractGuardAuthenticator
// Return `true` to cause authentication success
Dumper::dump("checkCredentials");
if($user->getCredentials() === $credentials) {
if ($user->getCredentials() === $credentials) {
return true;
}else{
} else {
return false;
}
}
@ -104,12 +103,11 @@ class SessionAuthenticator extends AbstractGuardAuthenticator
// $url = $this->router->generate('unauthorized');
// return new RedirectResponse($url);
$content = $this->twig->render(
'default/unauthorized.html.twig', array()
'default/unauthorized.html.twig',
array()
);
$response = new Response($content, Response::HTTP_FORBIDDEN);
return $response;
}
/**
@ -128,13 +126,11 @@ class SessionAuthenticator extends AbstractGuardAuthenticator
// return new RedirectResponse($url);
$content = $this->twig->render(
'default/unauthorized.html.twig', array()
'default/unauthorized.html.twig',
array()
);
$response = new Response($content, Response::HTTP_FORBIDDEN);
return $response;
}
public function supportsRememberMe()
@ -142,11 +138,11 @@ class SessionAuthenticator extends AbstractGuardAuthenticator
return false;
}
public function onLogoutSuccess(Request $request) {
public function onLogoutSuccess(Request $request)
{
//$homepage = $this->config["homepage"];
//return \phpCAS::logoutWithRedirectService($this->urlGenerator->generate($homepage, array(), UrlGeneratorInterface::ABSOLUTE_URL));
header('Location: /index.php');
return ;
}
}
}

37
console/skel/symfony-app/src/Session/AuthBundle/DependencyInjection/Configuration.php
View file

@ -11,12 +11,14 @@ use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
*
* To learn more see {@link http://symfony.com/doc/current/cookbook/bundles/configuration.html}
*/
class Configuration implements ConfigurationInterface {
class Configuration implements ConfigurationInterface
{
/**
* {@inheritdoc}
*/
public function getConfigTreeBuilder() {
public function getConfigTreeBuilder()
{
$treeBuilder = new TreeBuilder('session_auth');
$rootNode = $treeBuilder->getRootNode();
$rootNode
@ -36,15 +38,15 @@ class Configuration implements ConfigurationInterface {
->end()
;
$rootNode
->validate()
$rootNode
->validate()
->ifTrue(function ($v) {
if(!is_null($v['user_entity'])){
if (!is_null($v['user_entity'])) {
$class = $v['user_entity'];
if(!class_exists($class)){
if (!class_exists($class)) {
return true;
}
return !array_key_exists("Symfony\Component\Security\Core\User\UserInterface", class_implements($class));
return !array_key_exists("Symfony\Component\Security\Core\User\UserInterface", class_implements($class));
}
return false;
})
@ -57,8 +59,8 @@ class Configuration implements ConfigurationInterface {
return $treeBuilder;
}
private function _addCasConfig(ArrayNodeDefinition $node) {
private function _addCasConfig(ArrayNodeDefinition $node)
{
$node
->children()
->arrayNode('cas')->info('A déclarer si authentification pas CAS.')
@ -75,17 +77,18 @@ class Configuration implements ConfigurationInterface {
->end()
;
$node
->validate()
$node
->validate()
->ifTrue(function ($v) {
$cas_config = $v['cas'];
return ($v['type_auth']=="Cas" && (is_null($cas_config['hostname']) || is_null($cas_config['port']) || is_null($cas_config['uri'])) );
return ($v['type_auth']=="Cas" && (is_null($cas_config['hostname']) || is_null($cas_config['port']) || is_null($cas_config['uri'])));
})
->thenInvalid("En utilisant le type d'authentification Cas vous devez renseigner la section 'cas' et ses clés 'hostname', 'port', 'uri'")
->end();
}
}
private function _addRsaConfig(ArrayNodeDefinition $node) {
private function _addRsaConfig(ArrayNodeDefinition $node)
{
$node
->children()
->arrayNode('rsa')->addDefaultsIfNotSet()->info('A déclarer si authentification pas RSA.')
@ -98,13 +101,13 @@ class Configuration implements ConfigurationInterface {
->end()
;
$node
->validate()
$node
->validate()
->ifTrue(function ($v) {
$rsa_config = $v['rsa'];
return ($v['type_auth']==="Rsa" && is_null($rsa_config['logout_url']));
})
->thenInvalid("En utilisant le type d'authentification Rsa vous devez renseigner la section 'rsa' et sa clé 'logout_url'")
->end();
}
}
}

19
console/skel/symfony-app/src/Session/AuthBundle/DependencyInjection/SessionAuthExtension.php
View file

@ -14,13 +14,14 @@ use Symfony\Component\DependencyInjection\ChildDefinition;
*
* @link http://symfony.com/doc/current/cookbook/bundles/extension.html
*/
class SessionAuthExtension extends Extension {
class SessionAuthExtension extends Extension
{
/**
* {@inheritdoc}
*/
public function load(array $configs, ContainerBuilder $container) {
public function load(array $configs, ContainerBuilder $container)
{
$configs[0]['environment'] = $container->getParameter("kernel.environment");
$configuration = new Configuration();
$config = $this->processConfiguration($configuration, $configs);
@ -33,9 +34,9 @@ class SessionAuthExtension extends Extension {
//definition du service d'authentification par défaut dans le cas où ce ne serait pas un service
// fraichement créé par l'utilisateur dans le fichiers services.yaml
if(is_null($config["authentication_service"])){
if (is_null($config["authentication_service"])) {
$authentication_service = "session_auth.authentification";
}else{
} else {
$authentication_service = $config["authentication_service"];
}
@ -62,21 +63,21 @@ class SessionAuthExtension extends Extension {
->addArgument(new Reference($authentication_service))
->addArgument($config)
->setPublic(false);
}else{
} else {
$container->register('session_auth.user_provider', $config["provider"])
->addArgument(new Reference($authentication_service))
->addArgument($config)
->setPublic(false);
}
$container->setDefinition('session_auth.configuration', new \Symfony\Component\DependencyInjection\Definition( \App\Besancon\AuthBundle\DependencyInjection\Configuration::class) )
$container->setDefinition('session_auth.configuration', new \Symfony\Component\DependencyInjection\Definition(\App\Besancon\AuthBundle\DependencyInjection\Configuration::class))
->setArguments([
$config,
]);
}
public function getNamespace() {
public function getNamespace()
{
return 'http://ac-besancon.fr/schema/dic/' . $this->getAlias();
}
}

20
console/skel/symfony-app/src/Session/AuthBundle/Events/CheckCredentialsEvent.php
View file

@ -5,30 +5,34 @@ namespace App\Session\AuthBundle\Events;
use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\Security\Core\User\UserInterface;
class CheckCredentialsEvent extends Event {
class CheckCredentialsEvent extends Event
{
const NAME = "besancon_auth.event.check_credentials";
private $access = true;
public function __construct($credentials, UserInterface $user_interface) {
public function __construct($credentials, UserInterface $user_interface)
{
$this->credentials = $credentials;
$this->user_interface = $user_interface;
}
public function getCredentials() {
public function getCredentials()
{
return $this->credentials;
}
public function getUserInterface() {
public function getUserInterface()
{
return $this->user_interface;
}
public function getAccess() {
public function getAccess()
{
return $this->access;
}
public function setAccess($access) {
public function setAccess($access)
{
$this->access = $access;
return $this;
}
}

21
console/skel/symfony-app/src/Session/AuthBundle/Events/OnAuthenticationFailureEvent.php
View file

@ -7,32 +7,35 @@ use Symfony\Component\Security\Core\Exception\AuthenticationException;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpFoundation\Response;
class OnAuthenticationFailureEvent extends Event {
class OnAuthenticationFailureEvent extends Event
{
const NAME = "session_auth.event.on_authentication_failure";
public function __construct(Request $request, AuthenticationException $exception) {
public function __construct(Request $request, AuthenticationException $exception)
{
$this->request = $request;
$this->exception = $exception;
$this->response = new Response($exception->getMessage(), Response::HTTP_FORBIDDEN);
}
public function getRequest() {
public function getRequest()
{
return $this->request;
}
public function getException() {
public function getException()
{
return $this->exception;
}
public function getResponse() {
public function getResponse()
{
return $this->response;
}
public function setResponse($response) {
public function setResponse($response)
{
$this->response = $response;
return $this;
}
}

18
console/skel/symfony-app/src/Session/AuthBundle/Events/OnAuthenticationSuccessEvent.php
View file

@ -5,27 +5,29 @@ use Symfony\Component\EventDispatcher\Event;
use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
use Symfony\Component\HttpFoundation\Request;
class OnAuthenticationSuccessEvent extends Event {
class OnAuthenticationSuccessEvent extends Event
{
const NAME = "session_auth.event.on_authentication_success";
public function __construct(Request $request, TokenInterface $token, $providerKey) {
public function __construct(Request $request, TokenInterface $token, $providerKey)
{
$this->request = $request;
$this->token = $token;
$this->providerKey = $providerKey;
}
public function getRequest() {
public function getRequest()
{
return $this->request;
}
public function getToken() {
public function getToken()
{
return $this->exception;
}
public function getProviderKey() {
public function getProviderKey()
{
return $this->providerKey;
}
}

5
console/skel/symfony-app/src/Session/AuthBundle/Security/Abstracts/AuthAbstract.php
View file

@ -15,7 +15,8 @@ namespace App\Session\AuthBundle\Security\Abstracts;
use App\Session\AuthBundle\Utils\Config;
use Symfony\Component\HttpFoundation\Response;
abstract class AuthAbstract {
abstract class AuthAbstract
{
/**
* @var App\Besancon\AuthBundle\Security\Interfaces\AttributesInterface $ai Instance de CasAttributes ou RsaAttributes
@ -73,6 +74,4 @@ abstract class AuthAbstract {
*
*/
abstract public function getUser($username);
}

13
console/skel/symfony-app/src/Session/AuthBundle/Security/Abstracts/AuthFinal.php
View file

@ -15,7 +15,8 @@ namespace App\Session\AuthBundle\Security\Abstracts;
use App\Session\AuthBundle\Utils\Config;
use Symfony\Component\HttpFoundation\Response;
class AuthFinal extends AuthAbstract {
class AuthFinal extends AuthAbstract
{
/**
* Intancie le getters en fonction de la configuration
@ -33,7 +34,8 @@ class AuthFinal extends AuthAbstract {
* @return void
*
* */
public function setGetterAttributes($config) {
public function setGetterAttributes($config)
{
$type_auth = Config::getDeclaredType($config);
//dump('calls');
$getters = "\App\Session\AuthBundle\Security\Getters\\" . $type_auth . "Attributes";
@ -55,7 +57,8 @@ class AuthFinal extends AuthAbstract {
* @return Symfony\Component\HttpFoundation\Response
*
* */
public function onAuthenticationFailure(\Symfony\Component\Security\Core\Exception\AuthenticationException $exception) {
public function onAuthenticationFailure(\Symfony\Component\Security\Core\Exception\AuthenticationException $exception)
{
return new Response($exception->getMessage(), Response::HTTP_FORBIDDEN);
}
@ -76,12 +79,12 @@ class AuthFinal extends AuthAbstract {
* @return \Symfony\Component\Security\Core\User\UserInterface
*
*/
public function getUser($username) {
public function getUser($username)
{
$roles_service = $this->getRoles();
$roles = (!is_null($roles_service) && is_array($roles_service)) ? $roles_service : array();
$user = new \App\Besancon\AuthBundle\Security\User\AuthUser($username, md5("8sQaz87dPPsdanYakq86f" . $username), $roles);
return $user;
}
}

24
console/skel/symfony-app/src/Session/AuthBundle/Security/Abstracts/GetterAbstract.php
View file

@ -2,7 +2,7 @@
/**
* Abstract class GetterAbstract
*
*
* @package Besancon\AuthBundle\Security\Abstracts
* @author Amine BEL HADJ ALI <amine.belhadjali@ac-besancon.fr>
*/
@ -14,29 +14,35 @@ namespace App\Session\AuthBundle\Security\Abstracts;
*
* @author belhadjali
*/
abstract class GetterAbstract {
public function isACP(){
abstract class GetterAbstract
{
public function isACP()
{
return $this->getFrEduFonctAdm() == "ACP";
}
public function isDIR(){
public function isDIR()
{
return $this->getFrEduFonctAdm() == "DIR";
}
public function isDEC(){
public function isDEC()
{
return $this->getFrEduFonctAdm() == "DEC";
}
public function isDIR1D(){
public function isDIR1D()
{
return $this->isDEC();
}
public function isIEN1D (){
public function isIEN1D()
{
return $this->getFrEduFonctAdm() == "IEN1D";
}
public function isDIO(){
public function isDIO()
{
return $this->getFrEduFonctAdm() == "IEN1D";
}
}

8
console/skel/symfony-app/src/Session/AuthBundle/Security/AuthenticatorFactory.php
View file

@ -13,9 +13,10 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use App\Session\AuthBundle\Utils\Config;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
class AuthenticatorFactory {
public static function getAuthenticator(AuthInterface $authService, Array $config, UrlGeneratorInterface $urlGenerator,EventDispatcherInterface $dispatcher) {
class AuthenticatorFactory
{
public static function getAuthenticator(AuthInterface $authService, array $config, UrlGeneratorInterface $urlGenerator, EventDispatcherInterface $dispatcher)
{
$type_auth = Config::getDeclaredType($config);
$authenticator_class = "App\Session\AuthBundle\Security\\" . $type_auth . "Authenticator";
@ -23,5 +24,4 @@ class AuthenticatorFactory {
return $authenticator;
}
}

41
console/skel/symfony-app/src/Session/AuthBundle/Security/CasAuthenticator.php
View file

@ -28,12 +28,13 @@ use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
use Symfony\Component\Security\Guard\AuthenticatorInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
class CasAuthenticator extends AbstractFormLoginAuthenticator implements LogoutSuccessHandlerInterface, AuthenticatorInterface {
class CasAuthenticator extends AbstractFormLoginAuthenticator implements LogoutSuccessHandlerInterface, AuthenticatorInterface
{
private $authService;
private $urlGenerator;
public function __construct(AuthInterface $authService, Array $config, UrlGeneratorInterface $urlGenerator, EventDispatcherInterface $dispatcher) {
public function __construct(AuthInterface $authService, array $config, UrlGeneratorInterface $urlGenerator, EventDispatcherInterface $dispatcher)
{
$this->urlGenerator = $urlGenerator;
//Récupérer le service déaclaré authService
$this->authService = $authService;
@ -51,31 +52,34 @@ class CasAuthenticator extends AbstractFormLoginAuthenticator implements LogoutS
* Called on every request. Return whatever credentials you want,
* or null to stop authentication.
*/
public function getCredentials(Request $request) {
public function getCredentials(Request $request)
{
return true;
}
public function getUser($credentials, UserProviderInterface $userProvider) {
public function getUser($credentials, UserProviderInterface $userProvider)
{
$username = \phpCAS::getUser();
$user = $userProvider->loadUserByUsername($username);
return $user;
}
public function checkCredentials($credentials, UserInterface $user) {
public function checkCredentials($credentials, UserInterface $user)
{
return $this->authService->ctrlAccess($user);
}
public function onAuthenticationSuccess(Request $request, TokenInterface $token, $providerKey) {
public function onAuthenticationSuccess(Request $request, TokenInterface $token, $providerKey)
{
$event = new OnAuthenticationSuccessEvent($request, $token, $providerKey);
$this->dispatcher->dispatch(OnAuthenticationSuccessEvent::NAME, $event);
$this->authService->onSuccess($token);
// on success, let the request continue
// on success, let the request continue
}
public function onAuthenticationFailure(Request $request, AuthenticationException $exception) {
public function onAuthenticationFailure(Request $request, AuthenticationException $exception)
{
$event = new OnAuthenticationFailureEvent($request, $exception);
$this->dispatcher->dispatch(OnAuthenticationFailureEvent::NAME, $event);
@ -90,25 +94,28 @@ class CasAuthenticator extends AbstractFormLoginAuthenticator implements LogoutS
// return new RedirectResponse($url);
// }
public function supportsRememberMe() {
public function supportsRememberMe()
{
return false;
}
//implementation LogoutSuccessHandlerInterface
public function onLogoutSuccess(Request $request) {
//implementation LogoutSuccessHandlerInterface
public function onLogoutSuccess(Request $request)
{
$homepage = $this->config["homepage"];
return \phpCAS::logoutWithRedirectService($this->urlGenerator->generate($homepage, array(), UrlGeneratorInterface::ABSOLUTE_URL));
}
protected function getLoginUrl() {
protected function getLoginUrl()
{
return \phpCas::getServerLoginURL();
}
public function supports(Request $request) {
public function supports(Request $request)
{
if (isset($this->config['environment']) && $this->config['environment'] == "test") {
return false;
}
return true;
}
}

24
console/skel/symfony-app/src/Session/AuthBundle/Security/DefaultAuthentication.php
View file

@ -30,7 +30,8 @@ use Symfony\Component\Security\Core\User\UserChecker;
*
* @author belhadjali
*/
class DefaultAuthentication extends AuthFinal implements AuthInterface {
class DefaultAuthentication extends AuthFinal implements AuthInterface
{
/**
* @var string Uniquely identifies the secured area
@ -48,9 +49,11 @@ class DefaultAuthentication extends AuthFinal implements AuthInterface {
'secured_area'
);
$userProvider = new UserProvider( new Authentication(),
$userProvider = new UserProvider(
new Authentication(),
array('user_entity' => 'App\Session\AuthBundle\Security\Auth\User',
'type_auth' => 'Cas'));
'type_auth' => 'Cas')
);
$userChecker = new UserChecker();
$defaultEncoder = new MessageDigestPasswordEncoder('sha512', true, 5000);
@ -65,7 +68,8 @@ class DefaultAuthentication extends AuthFinal implements AuthInterface {
$userProvider,
$userChecker,
'secured_area',
$encoderFactory);
$encoderFactory
);
$authenticatedToken = $provider
@ -76,11 +80,13 @@ class DefaultAuthentication extends AuthFinal implements AuthInterface {
//$tokenStorage->setToken($authenticatedToken);
}
public function getRoles() {
public function getRoles()
{
return [];
}
public function onSuccess($token) {
public function onSuccess($token)
{
//dump($this->ai);
//die('success');
@ -95,12 +101,14 @@ class DefaultAuthentication extends AuthFinal implements AuthInterface {
return;
}
public function ctrlAccess(\Symfony\Component\Security\Core\User\UserInterface $user) {
public function ctrlAccess(\Symfony\Component\Security\Core\User\UserInterface $user)
{
//die('ctrlAccess');
return true;
}
public function getUser($username) {
public function getUser($username)
{
return parent::getUser($username);
}
}

49
console/skel/symfony-app/src/Session/AuthBundle/Security/Getters/CasAttributes.php
View file

@ -1,5 +1,5 @@
<?php
/**
/**
* @package Besancon\AuthBundle\Security\Getters
* @author Amine BEL HADJ ALI <amine.belhadjali@ac-besancon.fr>
*/
@ -15,62 +15,75 @@ use App\Session\AuthBundle\Security\Interfaces\AttributesInterface;
* renvoyé par CAS à partir des méthodes d'accès définies dans l'interface AttributesInterface
*
*/
class CasAttributes implements AttributesInterface {
public function getFirstName() {
class CasAttributes implements AttributesInterface
{
public function getFirstName()
{
return \phpCAS::getAttribute("prenom");
}
public function getCompletName() {
public function getCompletName()
{
return \phpCAS::getAttribute("nomcomplet");
}
public function getName() {
public function getName()
{
return \phpCAS::getAttribute("nom");
}
public function getDiscipline() {
public function getDiscipline()
{
return \phpCAS::getAttribute("discipline");
}
public function getFonctM() {
public function getFonctM()
{
return \phpCAS::getAttribute("fonctm");
}
public function getRne() {
public function getRne()
{
return \phpCAS::getAttribute("rne");
}
public function getFreDuRne() {
public function getFreDuRne()
{
return \phpCAS::getAttribute("FrEduRne");
}
public function getFreDuRneResp() {
public function getFreDuRneResp()
{
return \phpCAS::getAttribute("FrEduRneResp");
}
public function getMail() {
public function getMail()
{
return \phpCAS::getAttribute("mail");
}
public function getTitle() {
public function getTitle()
{
return \phpCAS::getAttribute("title");
}
public function getUsername() {
public function getUsername()
{
return \phpCAS::getUser();
}
public function getFrEduResDel(){
public function getFrEduResDel()
{
return \phpCAS::getAttribute("FrEduResDel");
}
public function getFrEduFonctAdm() {
public function getFrEduFonctAdm()
{
return \phpCAS::getAttribute("FrEduFonctAdm");
}
public function getGrade() {
public function getGrade()
{
return \phpCAS::getAttribute("grade");
}
}

51
console/skel/symfony-app/src/Session/AuthBundle/Security/Getters/RsaAttributes.php
View file

@ -19,62 +19,75 @@ use App\Besancon\AuthBundle\Security\Interfaces\AttributesInterface;
* renvoyé par RSA CT à partir des méthodes d'accès définies dans l'interface AttributesInterface
*
*/
class RsaAttributes implements AttributesInterface {
public function getCompletName() {
class RsaAttributes implements AttributesInterface
{
public function getCompletName()
{
return (isset($_SERVER['HTTP_CN'])) ? $_SERVER['HTTP_CN'] : null;
}
public function getDiscipline() {
public function getDiscipline()
{
return (isset($_SERVER['HTTP_DISCIPLINE'])) ? $_SERVER['HTTP_DISCIPLINE'] : null;
}
public function getFonctM() {
public function getFonctM()
{
return (isset($_SERVER['HTTP_FONCTM'])) ? $_SERVER['HTTP_FONCTM'] : null;
}
public function getRne() {
public function getRne()
{
return (isset($_SERVER['HTTP_RNE'])) ? $_SERVER['HTTP_FREDURNE'] : null;
}
public function getFreDuRne() {
public function getFreDuRne()
{
return (isset($_SERVER['HTTP_FREDURNE'])) ? explode(',', $_SERVER['HTTP_FREDURNE']) : null;
}
public function getFreDuRneResp() {
public function getFreDuRneResp()
{
return (isset($_SERVER['HTTP_FREDURNERESP'])) ? explode(',', $_SERVER['HTTP_FREDURNERESP']) : null;
}
public function getMail() {
public function getMail()
{
return (isset($_SERVER['HTTP_CTEMAIL'])) ? $_SERVER['HTTP_CTEMAIL'] : null;
}
public function getTitle() {
public function getTitle()
{
return (isset($_SERVER['HTTP_TITLE'])) ? $_SERVER['HTTP_TITLE'] : null;
}
public function getUsername() {
public function getUsername()
{
return (isset($_SERVER['HTTP_CT_REMOTE_USER'])) ? $_SERVER['HTTP_CT_REMOTE_USER'] : null;
}
public function getFrEduResDel() {
public function getFrEduResDel()
{
return (isset($_SERVER['HTTP_FREDURESDEL'])) ? $_SERVER['HTTP_FREDURESDEL'] : null;
}
public function getFrEduFonctAdm() {
public function getFrEduFonctAdm()
{
return (isset($_SERVER['HTTP_FREDUFONCTADM'])) ? $_SERVER['HTTP_FREDUFONCTADM'] : null;
}
public function getFirstName() {
return (isset($_SERVER['HTTP_CTFN'])) ? $_SERVER['HTTP_CTFN'] : null;
public function getFirstName()
{
return (isset($_SERVER['HTTP_CTFN'])) ? $_SERVER['HTTP_CTFN'] : null;
}
public function getName() {
return (isset($_SERVER['HTTP_CTLN'])) ? $_SERVER['HTTP_CTLN'] : null;
public function getName()
{
return (isset($_SERVER['HTTP_CTLN'])) ? $_SERVER['HTTP_CTLN'] : null;
}
public function getGrade() {
public function getGrade()
{
return (isset($_SERVER['HTTP_GRADE'])) ? $_SERVER['HTTP_GRADE'] : null;
}
}

49
console/skel/symfony-app/src/Session/AuthBundle/Security/Getters/SessionAttributes.php
View file

@ -15,62 +15,75 @@ use App\Session\AuthBundle\Security\Interfaces\AttributesInterface;
* renvoyé par CAS à partir des méthodes d'accès définies dans l'interface AttributesInterface
*
*/
class SessionAttributes implements AttributesInterface {
public function getFirstName() {
class SessionAttributes implements AttributesInterface
{
public function getFirstName()
{
return ;
}
public function getCompletName() {
public function getCompletName()
{
return ;
}
public function getName() {
public function getName()
{
return ;
}
public function getDiscipline() {
public function getDiscipline()
{
return ;
}
public function getFonctM() {
public function getFonctM()
{
return ;
}
public function getRne() {
public function getRne()
{
return ;
}
public function getFreDuRne() {
public function getFreDuRne()
{
return ;
}
public function getFreDuRneResp() {
public function getFreDuRneResp()
{
return ;
}
public function getMail() {
public function getMail()
{
return ;
}
public function getTitle() {
public function getTitle()
{
return ;
}
public function getUsername() {
public function getUsername()
{
return ;
}
public function getFrEduResDel(){
public function getFrEduResDel()
{
return ;
}
public function getFrEduFonctAdm() {
public function getFrEduFonctAdm()
{
return ;
}
public function getGrade() {
public function getGrade()
{
return ;
}
}
}

337
console/skel/symfony-app/src/Session/AuthBundle/Security/Interfaces/AttributesInterface.php
View file

@ -15,201 +15,200 @@ namespace App\Session\AuthBundle\Security\Interfaces;
*/
interface AttributesInterface
{
const NO_VALUE = "X";
const NO_VALUE = "X";
const FREDURNE_OFFSET_RNE = 0;
const FREDURNE_OFFSET_SECTEUR = 2;
const FREDURNE_OFFSET_FONCTION_EXERCICE = 3;
const FREDURNE_OFFSET_FONCTION_RNEUAJ = 4;
const FREDURNE_OFFSET_1CODETNA = 5; // 1er chiffre code nature nomenclature
const FREDURNE_OFFSET_CODETTY = 6; // code type etablissement nomenclature
const FREDURNE_OFFSET_CODETNA = 7; // code nature etablissement nomenclature
const FREDURNE_OFFSET_RNE = 0;
const FREDURNE_OFFSET_SECTEUR = 2;
const FREDURNE_OFFSET_FONCTION_EXERCICE = 3;
const FREDURNE_OFFSET_FONCTION_RNEUAJ = 4;
const FREDURNE_OFFSET_1CODETNA = 5; // 1er chiffre code nature nomenclature
const FREDURNE_OFFSET_CODETTY = 6; // code type etablissement nomenclature
const FREDURNE_OFFSET_CODETNA = 7; // code nature etablissement nomenclature
const FREDURNERESP_OFFSET_RNE = 0;
const FREDURNERESP_OFFSET_SECTEUR = 2; //PU ou PR
const FREDURNERESP_OFFSET_SECTEUR = 2; //PU ou PR
const FREDURNERESP_OFFSET_AFFECTATION = 3; // A pour Affectation anticipé N pour affectation normale F pour affectation qui fini le 31/08
const FREDURNERESP_OFFSET_1CODETNA = 4; // 1er chiffre code nature nomenclature
const FREDURNERESP_OFFSET_CODETTY = 5; // code type etablissement nomenclature
const FREDURNERESP_OFFSET_CODETNA = 6; // code nature nomenclature
const FREDURNERESP_OFFSET_1CODETNA = 4; // 1er chiffre code nature nomenclature
const FREDURNERESP_OFFSET_CODETTY = 5; // code type etablissement nomenclature
const FREDURNERESP_OFFSET_CODETNA = 6; // code nature nomenclature
const TYPE_LYCEE_GENERAL = "LYC";
const TYPE_LYCEE_PRO = "LP";
const TYPE_COLLEGE = "CLG";
const TYPE_SEGPA = "SES";
const TYPE_LYCEE_PRO = "LP";
const TYPE_COLLEGE = "CLG";
const TYPE_SEGPA = "SES";
const CODE_NATURE_RECTORAT = ["802"];
const CODE_NATURE_DSDEN = ["806"];
const CODE_NATURE_INSPECTION = ["809"];
const CODE_NATURE_LYCEE_GENERAL_ET_TECHNO = ["300"];
const CODE_NATURE_LYCEE_TECHNO = ["301"];
const CODE_NATURE_LYCEE_GENERAL = ["302", "306"];
const CODE_NATURE_LYCEE_AGRICOLE = ["307"];
const CODE_NATURE_LYCEE_PRO = ["320"];
const CODE_NATURE_COLLEGE = ["340"];
const CODE_COLLEGE_NATURE_SPE = ["352"];
const CODE_NATURE_SEGPA = ["390"];
const CODE_NATURE_RECTORAT = ["802"];
const CODE_NATURE_DSDEN = ["806"];
const CODE_NATURE_INSPECTION = ["809"];
const CODE_NATURE_LYCEE_GENERAL_ET_TECHNO = ["300"];
const CODE_NATURE_LYCEE_TECHNO = ["301"];
const CODE_NATURE_LYCEE_GENERAL = ["302", "306"];
const CODE_NATURE_LYCEE_AGRICOLE = ["307"];
const CODE_NATURE_LYCEE_PRO = ["320"];
const CODE_NATURE_COLLEGE = ["340"];
const CODE_COLLEGE_NATURE_SPE = ["352"];
const CODE_NATURE_SEGPA = ["390"];
const GRADES_IEN = ["1152", "1151"];
const GRADES_IEN = ["1152", "1151"];
const GRADES_RECTEUR = ["0201"];
const GRADES_SG = ["0211", "0911", "0912"];
const GRADES_ASG = ["0981"];
const GRADES_RECTEUR = ["0201"];
const GRADES_SG = ["0211", "0911", "0912"];
const GRADES_ASG = ["0981"];
const GRADES_DASEN = ["0921", "0922"];
const GRADES_ADJOINT_DASEN = ["0971"];
const GRADES_DASEN = ["0921", "0922"];
const GRADES_ADJOINT_DASEN = ["0971"];
const CODES_DISCIPLINE_ASH = ["N0006"];
const CODES_DISCIPLINE_DIR = ["D0010"];
const CODES_DISCIPLINE_ADJOINT_DIR = ["D0011"];
/**
* Renvoie le prénom de l'agent
*
* Correspond au champ "givenName" du LDAP
*
* @return string|null
* prénom de l'agent
*/
public function getFirstName();
const CODES_DISCIPLINE_ASH = ["N0006"];
const CODES_DISCIPLINE_DIR = ["D0010"];
const CODES_DISCIPLINE_ADJOINT_DIR = ["D0011"];
/**
* Renvoie le prénom de l'agent
*
* Correspond au champ "givenName" du LDAP
*
* @return string|null
* prénom de l'agent
*/
public function getFirstName();
/**
* Renvoie l'identifiant LDAP de l'agent
*
* Correspond au champ "uid" du LDAP
*
* @return string|null
* uid de l'agent
*/
public function getUsername();
/**
* Renvoie l'identifiant LDAP de l'agent
*
* Correspond au champ "uid" du LDAP
*
* @return string|null
* uid de l'agent
*/
public function getUsername();
/**
* Renvoie le nom de famille de l'agent
*
* Correspond au champ "sn" du LDAP
*
* @return string|null
* nom de l'agent
*/
public function getName();
/**
* Renvoie le nom de famille de l'agent
*
* Correspond au champ "sn" du LDAP
*
* @return string|null
* nom de l'agent
*/
public function getName();
/**
* Renvoie l'adresse mail de l'agent
*
* Correspond au champ "mail" du LDAP
*
* @return string|null
* adresse mail de l'agent
*/
public function getMail();
/**
* Renvoie l'adresse mail de l'agent
*
* Correspond au champ "mail" du LDAP
*
* @return string|null
* adresse mail de l'agent
*/
public function getMail();
/**
* Renvoie le nom complet de l'agent
*
* Correspond au champ "cn" du LDAP
*
* @return string|null
* nom complete de l'agent
*/
public function getCompletName();
/**
* Renvoie le nom complet de l'agent
*
* Correspond au champ "cn" du LDAP
*
* @return string|null
* nom complete de l'agent
*/
public function getCompletName();
/**
* Renvoie le title de l'agent
*
* Correspond au champ "title" du LDAP
*
* @return string|null
* title de l'agent
*/
public function getTitle();
/**
* Renvoie le title de l'agent
*
* Correspond au champ "title" du LDAP
*
* @return string|null
* title de l'agent
*/
public function getTitle();
/**
* Renvoie le code discipline de l'agent
*
* Correspond au champ "discipline" du LDAP
*
* @return string|null
* code discipline de l'agent
*/
public function getDiscipline();
/**
* Renvoie le code discipline de l'agent
*
* Correspond au champ "discipline" du LDAP
*
* @return string|null
* code discipline de l'agent
*/
public function getDiscipline();
/**
* Renvoie l'établissements d'affectation de l'agent
*
* Correspond au champ "rne" du LDAP
*
* @return string|null
* * établissement d'affectation de l'agent
*/
public function getRne();
/**
* Renvoie l'établissements d'affectation de l'agent
*
* Correspond au champ "rne" du LDAP
*
* @return string|null
* * établissement d'affectation de l'agent
*/
public function getRne();
/**
* Renvoie l'établissements d’exercice de l'agent
*
* Correspond au champ "FreDuRne" du LDAP
*
* @return array|null
* établissement(s) d'exercice de l'agent
*/
public function getFreDuRne();
/**
* Renvoie l'établissements d’exercice de l'agent
*
* Correspond au champ "FreDuRne" du LDAP
*
* @return array|null
* établissement(s) d'exercice de l'agent
*/
public function getFreDuRne();
/**
* Renvoie le(s) établissement(s) en responsabilité de l'agent
*
* Correspond au champ "FreDuRneResp" du LDAP
*
* @return array|null
* établissement(s) en responsabalité de l'agent
*/
public function getFreDuRneResp();
/**
* Renvoie le(s) établissement(s) en responsabilité de l'agent
*
* Correspond au champ "FreDuRneResp" du LDAP
*
* @return array|null
* établissement(s) en responsabalité de l'agent
*/
public function getFreDuRneResp();
/**
* Renvoie le(s) déléguation(s)/attribution(s) de l'agent ouvrant des droits d'accès
* à une ressource d'une application pour un ou des rne
*
* Correspond au champ "FreDuRneDel" du LDAP
*
* @return array|null
* déléguation(s)/attribution(s) de l'agent
*/
public function getFrEduResDel();
/**
* Renvoie le(s) déléguation(s)/attribution(s) de l'agent ouvrant des droits d'accès
* à une ressource d'une application pour un ou des rne
*
* Correspond au champ "FreDuRneDel" du LDAP
*
* @return array|null
* déléguation(s)/attribution(s) de l'agent
*/
public function getFrEduResDel();
/**
* Renvoie la fonction administrative de l'agent
* correspondant à un profil particulier
*
* Correspond au champ "FrEduFonctAdm" du LDAP
*
* @return string|null
* fonction administrative de l'agent
*/
public function getFrEduFonctAdm();
/**
* Renvoie la fonction administrative de l'agent
* correspondant à un profil particulier
*
* Correspond au champ "FrEduFonctAdm" du LDAP
*
* @return string|null
* fonction administrative de l'agent
*/
public function getFrEduFonctAdm();
/**
* Renvoie la fonction de l'agent
* Attention : initialisé à la création de la fiche avec la même valeur que l’attribut fonction.
* Puis, par l’application Annuaire, l’agent peut le modifier.
*
* Correspond au champ "fonctm" du LDAP
*
* @return string|null
* fonction de l'agent
*/
public function getFonctM();
/**
* Renvoie la fonction de l'agent
* Attention : initialisé à la création de la fiche avec la même valeur que l’attribut fonction.
* Puis, par l’application Annuaire, l’agent peut le modifier.
*
* Correspond au champ "fonctm" du LDAP
*
* @return string|null
* fonction de l'agent
*/
public function getFonctM();
/**
* Renvoie le grade de l'agent
* Alimenté à partir de la valeur agt.gradco
* Se référer à la base des nomenclatures dans la table N_GRADE pour voir
* les correspondances : http://infocentre.pleiade.education.fr/bcn/workspace/viewTable/n/N_GRADE
*
* Correspond au champ "grade" du LDAP
*
* @return string|null
* fonction de l'agent
*/
public function getGrade();
/**
* Renvoie le grade de l'agent
* Alimenté à partir de la valeur agt.gradco
* Se référer à la base des nomenclatures dans la table N_GRADE pour voir
* les correspondances : http://infocentre.pleiade.education.fr/bcn/workspace/viewTable/n/N_GRADE
*
* Correspond au champ "grade" du LDAP
*
* @return string|null
* fonction de l'agent
*/
public function getGrade();
}

62
console/skel/symfony-app/src/Session/AuthBundle/Security/Interfaces/AuthInterface.php
View file

@ -2,31 +2,31 @@
/**
* Interface AuthInterface
*
*
* Interface permettant de déclarer les méthodes incontournables pour l'authentification
*
*
*
*
* @package Besancon\AuthBundle\Security\Interfaces
* @author Amine BEL HADJ ALI <amine.belhadjali@ac-besancon.fr>
*
*
*/
namespace App\Session\AuthBundle\Security\Interfaces;
use Symfony\Component\Security\Core\User\UserInterface;
interface AuthInterface {
interface AuthInterface
{
/**
* Contrôle de l'accès à partir des attributs CAS ou RSA
*
*
* Vérifier les droits d'accès à l'application à partir des attributs récupérées des getters :
* - CasAttributes
* - RsaAttributes
*
* - RsaAttributes
*
* @param UserInterface $user
* L'entité user récupéré par le provider
*
*
* @return bool
* - true si accès autorisé
* - false si accès refusé
@ -35,52 +35,52 @@ interface AuthInterface {
/**
* Calcule et retoune le(s) rôle(s) à partir des attributs CAS ou RSA
*
*
* Calculer le(s) rôle(s) à partir des attributs récupérées des getters :
* - CasAttributes
* - RsaAttributes
* Doit retourner un tableau même vide
*
* - RsaAttributes
* Doit retourner un tableau même vide
*
* @return array
*/
public function getRoles();
/**
* Retourne un utilisateur pour la génération du token, si l'utilisateur n'existe pas en base de donnée
*
* ATTENTION : CETTE METHODE DOIT ÊTRE REDEFINIE SI UTILISATION D'UNE ENTITE UTILISTEUR
*
* ATTENTION : CETTE METHODE DOIT ÊTRE REDEFINIE SI UTILISATION D'UNE ENTITE UTILISTEUR
* DIFFERENTE DE CELLE UTILISEE PAR DEFAUT
*
*
* @param String $username
* uid de l'utilisateur récupéré de Cas ou Rsa
*
*
* @return UserInterface
*/
public function getUser($username);
/**
* Traitement personnalisé après récupération du token
*
*
* Il est possible d'enrichir le token (attributs...) ou d'effectuer des contrôles supplémentaire
*
* @param $token
*
* @param $token
* Token d'authification généré
*
*
* @return null
*/
public function onSuccess($token);
/**
* Traitement personnalisé lorsque la connexion n'a pas abouti
*
*
* Vérifié l'exception généré et adapter l'action (redirection, déconnexion...)
*
* Doit retourner un objet de type Response
*
*
* Doit retourner un objet de type Response
*
* Exemple :
*
* ```
* public function onAuthenticationFailure(\Symfony\Component\Security\Core\Exception\AuthenticationException $exception)
*
* ```
* public function onAuthenticationFailure(\Symfony\Component\Security\Core\Exception\AuthenticationException $exception)
* {
* $content = $this->twig->render(
* '@App/Test/forbiden.html.twig', array()
@ -90,9 +90,9 @@ interface AuthInterface {
* }
* ```
*
* @param AuthenticationException $exception
* @param AuthenticationException $exception
* Exception générée par le provider
*
*
* @return Symfony\Component\HttpFoundation\Response
*
*/

40
console/skel/symfony-app/src/Session/AuthBundle/Security/RsaAuthenticator.php
View file

@ -30,13 +30,14 @@ use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\Security\Guard\AuthenticatorInterface;
use Symfony\Component\EventDispatcher\EventDispatcherInterface;
class RsaAuthenticator extends AbstractFormLoginAuthenticator implements LogoutSuccessHandlerInterface, AuthenticatorInterface {
class RsaAuthenticator extends AbstractFormLoginAuthenticator implements LogoutSuccessHandlerInterface, AuthenticatorInterface
{
private $authService;
private $urlGenerator;
private $dispatcher;
public function __construct(AuthInterface $authService, Array $config, UrlGeneratorInterface $urlGenerator, EventDispatcherInterface $dispatcher) {
public function __construct(AuthInterface $authService, array $config, UrlGeneratorInterface $urlGenerator, EventDispatcherInterface $dispatcher)
{
$this->urlGenerator = $urlGenerator;
//Récupérer le service déaclaré authService
$this->authService = $authService;
@ -48,7 +49,8 @@ class RsaAuthenticator extends AbstractFormLoginAuthenticator implements LogoutS
* Called on every request. Return whatever credentials you want,
* or null to stop authentication.
*/
public function getCredentials(Request $request) {
public function getCredentials(Request $request)
{
if (!isset($_SERVER['HTTP_CT_REMOTE_USER']) || empty($_SERVER['HTTP_CT_REMOTE_USER'])) {
$this->returnRequest = $request->getUri();
throw new \LogicException("Impossible de continuer sous RSA : L'entête HTTP_CT_REMOTE_USER est vide ou manquante");
@ -56,22 +58,24 @@ class RsaAuthenticator extends AbstractFormLoginAuthenticator implements LogoutS
return true;
}
public function getUser($credentials, UserProviderInterface $userProvider) {
public function getUser($credentials, UserProviderInterface $userProvider)
{
$username = $_SERVER['HTTP_CT_REMOTE_USER'];
$user = $userProvider->loadUserByUsername($username);
return $user;
}
public function checkCredentials($credentials, UserInterface $user) {
$this->authService->ctrlAccess($user);
public function checkCredentials($credentials, UserInterface $user)
{
$this->authService->ctrlAccess($user);
// check credentials - e.g. make sure the password is valid
// no credential check is needed in this case
// return true to cause authentication success
return true;
}
public function onAuthenticationSuccess(Request $request, TokenInterface $token, $providerKey) {
public function onAuthenticationSuccess(Request $request, TokenInterface $token, $providerKey)
{
$event = new OnAuthenticationSuccessEvent($request, $token, $providerKey);
$this->dispatcher->dispatch(OnAuthenticationSuccessEvent::NAME, $event);
@ -79,8 +83,8 @@ class RsaAuthenticator extends AbstractFormLoginAuthenticator implements LogoutS
// on success, let the request continue
}
public function onAuthenticationFailure(Request $request, AuthenticationException $exception) {
public function onAuthenticationFailure(Request $request, AuthenticationException $exception)
{
$event = new OnAuthenticationFailureEvent($request, $exception);
$this->dispatcher->dispatch(OnAuthenticationFailureEvent::NAME, $event);
@ -95,26 +99,30 @@ class RsaAuthenticator extends AbstractFormLoginAuthenticator implements LogoutS
// return new RedirectResponse($url);
// }
public function supportsRememberMe() {
public function supportsRememberMe()
{
return false;
}
//implementation LogoutSuccessHandlerInterface
public function onLogoutSuccess(Request $request) {
public function onLogoutSuccess(Request $request)
{
$redirect = (isset($_SERVER['HTTP_FREDUURLRETOUR'])) ? $_SERVER['HTTP_FREDUURLRETOUR'] : $this->config['rsa']['logout_url'];
return new RedirectResponse($redirect);
}
protected function getLoginUrl() {
protected function getLoginUrl()
{
$return_request = urlencode($this->returnRequest);
$params = "?CT_ORIG_URL=" . $return_request;
return $this->config['rsa']['login_url'] . $params;
}
public function supports(Request $request) {
public function supports(Request $request)
{
if (isset($this->config['environment']) && $this->config['environment'] == "test") {
return false;
}
return true;
}
}
}

21
console/skel/symfony-app/src/Session/AuthBundle/Security/SessionAuthenticator.php
View file

@ -33,7 +33,7 @@ class SessionAuthenticator extends AbstractGuardAuthenticator
{
if (isset($_SESSION['id_utilisateur'])) {
return true;
}else{
} else {
return true;
}
}
@ -50,9 +50,9 @@ class SessionAuthenticator extends AbstractGuardAuthenticator
public function getUser($credentials, UserProviderInterface $userProvider)
{
if (!isset($_SESSION['id_utilisateur'])) {
$user = new \App\Classes\AuthUser('','','','','',['ROLE_USER']);
}else {
$user = new \App\Classes\AuthUser($_SESSION['id_utilisateur'], $_SESSION['identifiant'], $_SESSION['status_compte'], $_SESSION['type_compte'],$credentials, ['ROLE_USER', 'ROLE_USER_CONNECTED']);
$user = new \App\Classes\AuthUser('', '', '', '', '', ['ROLE_USER']);
} else {
$user = new \App\Classes\AuthUser($_SESSION['id_utilisateur'], $_SESSION['identifiant'], $_SESSION['status_compte'], $_SESSION['type_compte'], $credentials, ['ROLE_USER', 'ROLE_USER_CONNECTED']);
}
// if a User is returned, checkCredentials() is called
@ -65,9 +65,9 @@ class SessionAuthenticator extends AbstractGuardAuthenticator
// In case of an API token, no credential check is needed.
// Return `true` to cause authentication success
if($user->getCredentials() === $credentials) {
if ($user->getCredentials() === $credentials) {
return true;
}else{
} else {
return false;
}
}
@ -91,7 +91,6 @@ class SessionAuthenticator extends AbstractGuardAuthenticator
// return new JsonResponse($data, Response::HTTP_UNAUTHORIZED);
$url = $this->router->generate('unauthorized');
return new RedirectResponse($url);
}
/**
@ -108,8 +107,6 @@ class SessionAuthenticator extends AbstractGuardAuthenticator
$url = $this->router->generate('unauthorized');
return new RedirectResponse($url);
}
public function supportsRememberMe()
@ -117,11 +114,11 @@ class SessionAuthenticator extends AbstractGuardAuthenticator
return false;
}
public function onLogoutSuccess(Request $request) {
public function onLogoutSuccess(Request $request)
{
//$homepage = $this->config["homepage"];
//return \phpCAS::logoutWithRedirectService($this->urlGenerator->generate($homepage, array(), UrlGeneratorInterface::ABSOLUTE_URL));
header('Location: /index.php');
return ;
}
}
}

33
console/skel/symfony-app/src/Session/AuthBundle/Security/User/AuthUser.php
View file

@ -17,47 +17,55 @@ namespace App\Session\AuthBundle\Security\User;
use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\Security\Core\User\EquatableInterface;
class AuthUser implements UserInterface, EquatableInterface {
class AuthUser implements UserInterface, EquatableInterface
{
private $username;
private $salt;
private $roles = [];
public function __construct($username, $salt, array $roles = []) {
public function __construct($username, $salt, array $roles = [])
{
$this->username = $username;
$this->salt = $salt;
$this->roles = $roles;
}
public function getRoles() {
public function getRoles()
{
return $this->roles;
}
public function setRoles($roles) {
public function setRoles($roles)
{
return $this->roles = $roles;
}
public function addRole($role) {
public function addRole($role)
{
return $this->roles[] = $role;
}
public function getPassword() {
public function getPassword()
{
return;
}
public function getSalt() {
public function getSalt()
{
return $this->salt;
}
public function getUsername() {
public function getUsername()
{
return $this->username;
}
public function eraseCredentials() {
public function eraseCredentials()
{
}
public function isEqualTo(UserInterface $user) {
public function isEqualTo(UserInterface $user)
{
if (!$user instanceof AuthUser) {
return false;
}
@ -72,5 +80,4 @@ class AuthUser implements UserInterface, EquatableInterface {
return true;
}
}

22
console/skel/symfony-app/src/Session/AuthBundle/Security/User/AuthUserProvider.php
View file

@ -13,9 +13,10 @@ use Symfony\Component\Security\Core\User\UserProviderInterface;
use Symfony\Component\Security\Core\User\UserInterface;
use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
class AuthUserProvider implements UserProviderInterface {
public function __construct(AuthInterface $authService, Array $config) {
class AuthUserProvider implements UserProviderInterface
{
public function __construct(AuthInterface $authService, array $config)
{
$this->config = $config;
if (!is_null($this->config['user_entity'])) {
@ -26,33 +27,36 @@ class AuthUserProvider implements UserProviderInterface {
$this->authService = $authService;
}
public function loadUserByUsername($username) {
public function loadUserByUsername($username)
{
$entity_user = $this->entity_user;
return $this->authService->getUser($username);
}
private function _ctrlInstanceUser(UserInterface $user) {
private function _ctrlInstanceUser(UserInterface $user)
{
$entity_user = $this->entity_user;
if (!$user instanceof $entity_user) {
throw new UnsupportedUserException(
sprintf('Instances of "%s" are not supported.', get_class($user))
sprintf('Instances of "%s" are not supported.', get_class($user))
);
}
return $user;
}
public function refreshUser(UserInterface $user) {
public function refreshUser(UserInterface $user)
{
$user = $this->_ctrlInstanceUser($user);
return $this->loadUserByUsername($user->getUsername());
}
public function supportsClass($class) {
public function supportsClass($class)
{
$entity_user = $this->entity_user;
return $this->entity_class === $class;
}
}

14
console/skel/symfony-app/src/Session/AuthBundle/Utils/Config.php
View file

@ -1,5 +1,6 @@
<?php
namespace App\Session\AuthBundle\Utils;
/*
* To change this license header, choose License Headers in Project Properties.
* To change this template file, choose Tools | Templates
@ -11,9 +12,10 @@ namespace App\Session\AuthBundle\Utils;
*
* @author belhadjali
*/
class Config {
public static function getDeclaredType($config) {
class Config
{
public static function getDeclaredType($config)
{
if (!isset($config['type_auth'])) {
throw new \LogicException('Paramètre type_auth manquant');
}
@ -25,11 +27,13 @@ class Config {
return self::formatType($type);
}
public static function formatType($type) {
public static function formatType($type)
{
return ucfirst(strtolower($type));
}
public static function typeIsSupported($type) {
public static function typeIsSupported($type)
{
$type_auth = self::formatType($type);
if (!in_array($type_auth, ['Rsa', 'Cas'])) {
throw new \LogicException('Seuls Cas et Rsa sont supportés pour le moment');

17
console/skel/symfony-app/src/Utils/Config.php
View file

@ -14,9 +14,10 @@ namespace App\Utils;
*
* @author belhadjali
*/
class Config {
public static function getDeclaredType($config) {
class Config
{
public static function getDeclaredType($config)
{
// if (!isset($config['type_auth'])) {
// throw new \LogicException('Paramètre type_auth manquant');
// }
@ -26,15 +27,17 @@ namespace App\Utils;
// self::typeIsSupported($type);
//
// return self::formatType($type);
return true;
return true;
}
public static function formatType($type) {
public static function formatType($type)
{
// return ucfirst(strtolower($type));
return;
return;
}
public static function typeIsSupported($type) {
public static function typeIsSupported($type)
{
// $type_auth = self::formatType($type);
// if (!in_array($type_auth, ['Rsa', 'Cas'])) {
// throw new \LogicException('Seuls Cas et Rsa sont supportés pour le moment');

6
console/skel/symfony/cache/Adapter/FilesystemTagAwareAdapter.php vendored
View file

@ -52,7 +52,8 @@ class FilesystemTagAwareAdapter extends AbstractTagAwareAdapter implements Prune
return $ok;
}
set_error_handler(static function () {});
set_error_handler(static function () {
});
$chars = '+-ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789';
try {
@ -197,7 +198,8 @@ class FilesystemTagAwareAdapter extends AbstractTagAwareAdapter implements Prune
continue;
}
set_error_handler(static function () {});
set_error_handler(static function () {
});
try {
if (rename($tagFolder, $renamed = substr_replace($tagFolder, bin2hex(random_bytes(4)), -9))) {

7
console/skel/symfony/cache/LockRegistry.php vendored
View file

@ -118,7 +118,9 @@ final class LockRegistry
}
static $signalingException, $signalingCallback;
$signalingException = $signalingException ?? unserialize("O:9:\"Exception\":1:{s:16:\"\0Exception\0trace\";a:0:{}}");
$signalingCallback = $signalingCallback ?? function () use ($signalingException) { throw $signalingException; };
$signalingCallback = $signalingCallback ?? function () use ($signalingException) {
throw $signalingException;
};
try {
$value = $pool->get($item->getKey(), $signalingCallback, 0);
@ -142,7 +144,8 @@ final class LockRegistry
if (null !== $h = self::$openedFiles[$key] ?? null) {
return $h;
}
set_error_handler(function () {});
set_error_handler(function () {
});
try {
$h = fopen(self::$files[$key], 'r+');
} finally {

4
console/skel/symfony/cache/Simple/ArrayCache.php vendored
View file

@ -82,7 +82,9 @@ class ArrayCache implements Psr16CacheInterface, LoggerAwareInterface, Resettabl
}
}
return $this->generateItems($keys, microtime(true), function ($k, $v, $hit) use ($default) { return $hit ? $v : $default; });
return $this->generateItems($keys, microtime(true), function ($k, $v, $hit) use ($default) {
return $hit ? $v : $default;
});
}
/**

4
console/skel/symfony/cache/Traits/MemcachedTrait.php vendored
View file

@ -86,7 +86,9 @@ trait MemcachedTrait
if (!static::isSupported()) {
throw new CacheException('Memcached >= 2.2.0 is required');
}
set_error_handler(function ($type, $msg, $file, $line) { throw new \ErrorException($msg, 0, $type, $file, $line); });
set_error_handler(function ($type, $msg, $file, $line) {
throw new \ErrorException($msg, 0, $type, $file, $line);
});
try {
$options += static::$defaultClientOptions;
$client = new \Memcached($options['persistent_id']);

8
console/skel/symfony/cache/Traits/RedisTrait.php vendored
View file

@ -61,7 +61,9 @@ trait RedisTrait
if ($redisClient instanceof \Predis\ClientInterface && $redisClient->getOptions()->exceptions) {
$options = clone $redisClient->getOptions();
\Closure::bind(function () { $this->options['exceptions'] = false; }, $options, $options)();
\Closure::bind(function () {
$this->options['exceptions'] = false;
}, $options, $options)();
$redisClient = new $redisClient($redisClient->getConnection(), $options);
}
@ -177,7 +179,9 @@ trait RedisTrait
throw new InvalidArgumentException(sprintf('Redis connection failed (%s): %s', $e->getMessage(), $dsn));
}
set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
set_error_handler(function ($type, $msg) use (&$error) {
$error = $msg;
});
$isConnected = $redis->isConnected();
restore_error_handler();
if (!$isConnected) {

52
console/skel/symfony/config/Definition/Builder/ExprBuilder.php
View file

@ -44,7 +44,9 @@ class ExprBuilder
*/
public function always(\Closure $then = null)
{
$this->ifPart = function ($v) { return true; };
$this->ifPart = function ($v) {
return true;
};
if (null !== $then) {
$this->thenPart = $then;
@ -65,7 +67,9 @@ class ExprBuilder
public function ifTrue(\Closure $closure = null)
{
if (null === $closure) {
$closure = function ($v) { return true === $v; };
$closure = function ($v) {
return true === $v;
};
}
$this->ifPart = $closure;
@ -80,7 +84,9 @@ class ExprBuilder
*/
public function ifString()
{
$this->ifPart = function ($v) { return is_string($v); };
$this->ifPart = function ($v) {
return is_string($v);
};
return $this;
}
@ -92,7 +98,9 @@ class ExprBuilder
*/
public function ifNull()
{
$this->ifPart = function ($v) { return null === $v; };
$this->ifPart = function ($v) {
return null === $v;
};
return $this;
}
@ -104,7 +112,9 @@ class ExprBuilder
*/
public function ifEmpty()
{
$this->ifPart = function ($v) { return empty($v); };
$this->ifPart = function ($v) {
return empty($v);
};
return $this;
}
@ -116,7 +126,9 @@ class ExprBuilder
*/
public function ifArray()
{
$this->ifPart = function ($v) { return is_array($v); };
$this->ifPart = function ($v) {
return is_array($v);
};
return $this;
}
@ -130,7 +142,9 @@ class ExprBuilder
*/
public function ifInArray(array $array)
{
$this->ifPart = function ($v) use ($array) { return in_array($v, $array, true); };
$this->ifPart = function ($v) use ($array) {
return in_array($v, $array, true);
};
return $this;
}
@ -144,7 +158,9 @@ class ExprBuilder
*/
public function ifNotInArray(array $array)
{
$this->ifPart = function ($v) use ($array) { return !in_array($v, $array, true); };
$this->ifPart = function ($v) use ($array) {
return !in_array($v, $array, true);
};
return $this;
}
@ -156,8 +172,12 @@ class ExprBuilder
*/
public function castToArray()
{
$this->ifPart = function ($v) { return !is_array($v); };
$this->thenPart = function ($v) { return array($v); };
$this->ifPart = function ($v) {
return !is_array($v);
};
$this->thenPart = function ($v) {
return array($v);
};
return $this;
}
@ -183,7 +203,9 @@ class ExprBuilder
*/
public function thenEmptyArray()
{
$this->thenPart = function ($v) { return array(); };
$this->thenPart = function ($v) {
return array();
};
return $this;
}
@ -201,7 +223,9 @@ class ExprBuilder
*/
public function thenInvalid($message)
{
$this->thenPart = function ($v) use ($message) {throw new \InvalidArgumentException(sprintf($message, json_encode($v))); };
$this->thenPart = function ($v) use ($message) {
throw new \InvalidArgumentException(sprintf($message, json_encode($v)));
};
return $this;
}
@ -215,7 +239,9 @@ class ExprBuilder
*/
public function thenUnset()
{
$this->thenPart = function ($v) { throw new UnsetKeyException('Unsetting key'); };
$this->thenPart = function ($v) {
throw new UnsetKeyException('Unsetting key');
};
return $this;
}

3
console/skel/symfony/config/Definition/EnumNode.php
View file

@ -47,7 +47,8 @@ class EnumNode extends ScalarNode
'The value %s is not allowed for path "%s". Permissible values: %s',
json_encode($value),
$this->getPath(),
implode(', ', array_map('json_encode', $this->values))));
implode(', ', array_map('json_encode', $this->values))
));
$ex->setPath($this->getPath());
throw $ex;

3
console/skel/symfony/config/FileLocator.php
View file

@ -86,7 +86,8 @@ class FileLocator implements FileLocatorInterface
private function isAbsolutePath($file)
{
if ($file[0] === '/' || $file[0] === '\\'
|| (strlen($file) > 3 && ctype_alpha($file[0])
|| (
strlen($file) > 3 && ctype_alpha($file[0])
&& $file[1] === ':'
&& ($file[2] === '\\' || $file[2] === '/')
)

4
console/skel/symfony/config/Loader/LoaderInterface.php
View file

@ -26,7 +26,7 @@ interface LoaderInterface
*
* @throws \Exception If something went wrong
*/
public function load($resource, string $type = NULL);
public function load($resource, string $type = null);
/**
* Returns whether this class supports the given resource.
@ -36,7 +36,7 @@ interface LoaderInterface
*
* @return bool True if this class supports the given resource, false otherwise
*/
public function supports($resource, string $type = NULL);
public function supports($resource, string $type = null);
/**
* Gets the loader resolver.

4
console/skel/symfony/config/Resource/GlobResource.php
View file

@ -101,7 +101,9 @@ class GlobResource implements \IteratorAggregate, SelfCheckingResourceInterface,
$files = iterator_to_array(new \RecursiveIteratorIterator(
new \RecursiveCallbackFilterIterator(
new \RecursiveDirectoryIterator($path, \FilesystemIterator::SKIP_DOTS | \FilesystemIterator::FOLLOW_SYMLINKS),
function (\SplFileInfo $file) { return '.' !== $file->getBasename()[0]; }
function (\SplFileInfo $file) {
return '.' !== $file->getBasename()[0];
}
),
\RecursiveIteratorIterator::LEAVES_ONLY
));

8
console/skel/symfony/config/Tests/Definition/Builder/ExprBuilderTest.php
View file

@ -34,13 +34,17 @@ class ExprBuilderTest extends TestCase
$this->assertFinalizedValueIs('new_value', $test, array('key' => true));
$test = $this->getTestBuilder()
->ifTrue(function ($v) { return true; })
->ifTrue(function ($v) {
return true;
})
->then($this->returnClosure('new_value'))
->end();
$this->assertFinalizedValueIs('new_value', $test);
$test = $this->getTestBuilder()
->ifTrue(function ($v) { return false; })
->ifTrue(function ($v) {
return false;
})
->then($this->returnClosure('new_value'))
->end();
$this->assertFinalizedValueIs('value', $test);

5
console/skel/symfony/config/Tests/Definition/Dumper/XmlReferenceDumperTest.php
View file

@ -35,7 +35,10 @@ class XmlReferenceDumperTest extends TestCase
private function getConfigurationAsString()
{
return str_replace("\n", PHP_EOL, <<<'EOL'
return str_replace(
"\n",
PHP_EOL,
<<<'EOL'
<!-- Namespace: http://example.org/schema/dic/acme_root -->
<!-- scalar-required: Required -->
<!-- enum-with-default: One of "this"; "that" -->

12
console/skel/symfony/config/Tests/Definition/NormalizationTest.php
View file

@ -30,7 +30,9 @@ class NormalizationTest extends TestCase
->node('encoders', 'array')
->useAttributeAsKey('class')
->prototype('array')
->beforeNormalization()->ifString()->then(function ($v) { return array('algorithm' => $v); })->end()
->beforeNormalization()->ifString()->then(function ($v) {
return array('algorithm' => $v);
})->end()
->children()
->node('algorithm', 'scalar')->end()
->end()
@ -135,7 +137,9 @@ class NormalizationTest extends TestCase
),
);
return array_map(function ($v) { return array($v); }, $configs);
return array_map(function ($v) {
return array($v);
}, $configs);
}
/**
@ -166,7 +170,9 @@ class NormalizationTest extends TestCase
),
);
return array_map(function ($v) { return array($v); }, $configs);
return array_map(function ($v) {
return array($v);
}, $configs);
}
/**

4
console/skel/symfony/config/Tests/Loader/FileLoaderTest.php
View file

@ -24,12 +24,12 @@ class FileLoaderTest extends TestCase
$locatorMockForAdditionalLoader = $this->getMockBuilder('Symfony\Component\Config\FileLocatorInterface')->getMock();
$locatorMockForAdditionalLoader->expects($this->any())->method('locate')->will($this->onConsecutiveCalls(
array('path/to/file1'), // Default
array('path/to/file1'), // Default
array('path/to/file1', 'path/to/file2'), // First is imported
array('path/to/file1', 'path/to/file2'), // Second is imported
array('path/to/file1'), // Exception
array('path/to/file1', 'path/to/file2') // Exception
));
));
$fileLoader = new TestFileLoader($locatorMock);
$fileLoader->setSupports(false);

3
console/skel/symfony/config/Tests/Loader/LoaderResolverTest.php
View file

@ -34,7 +34,8 @@ class LoaderResolverTest extends TestCase
$loader = $this->getMockBuilder('Symfony\Component\Config\Loader\LoaderInterface')->getMock();
$loader->expects($this->once())->method('supports')->will($this->returnValue(true));
$resolver = new LoaderResolver(array($loader));
$this->assertEquals($loader, $resolver->resolve(function () {}), '->resolve() returns the loader for the given resource');
$this->assertEquals($loader, $resolver->resolve(function () {
}), '->resolve() returns the loader for the given resource');
}
public function testLoaders()

4
console/skel/symfony/config/Tests/Resource/ClassExistenceResourceTest.php
View file

@ -56,7 +56,9 @@ EOF
public function testExistsKo()
{
spl_autoload_register($autoloader = function ($class) use (&$loadedClass) { $loadedClass = $class; });
spl_autoload_register($autoloader = function ($class) use (&$loadedClass) {
$loadedClass = $class;
});
try {
$res = new ClassExistenceResource('MissingFooClass');

3
console/skel/symfony/config/Util/XmlUtils.php
View file

@ -220,7 +220,8 @@ class XmlUtils
{
$errors = array();
foreach (libxml_get_errors() as $error) {
$errors[] = sprintf('[%s %s] %s (in %s - line %d, column %d)',
$errors[] = sprintf(
'[%s %s] %s (in %s - line %d, column %d)',
LIBXML_ERR_WARNING == $error->level ? 'WARNING' : 'ERROR',
$error->code,
trim($error->message),

8
console/skel/symfony/expression-language/Tests/ExpressionLanguageTest.php
View file

@ -290,12 +290,16 @@ class ExpressionLanguageTest extends TestCase
return [
[
function (ExpressionLanguage $el) {
$el->register('fn', function () {}, function () {});
$el->register('fn', function () {
}, function () {
});
},
],
[
function (ExpressionLanguage $el) {
$el->addFunction(new ExpressionFunction('fn', function () {}, function () {}));
$el->addFunction(new ExpressionFunction('fn', function () {
}, function () {
}));
},
],
[

15
console/skel/symfony/expression-language/Tests/ParserTest.php
View file

@ -91,7 +91,8 @@ class ParserTest extends TestCase
'3 - 3',
],
[
new Node\BinaryNode('*',
new Node\BinaryNode(
'*',
new Node\BinaryNode('-', new Node\ConstantNode(3), new Node\ConstantNode(3)),
new Node\ConstantNode(2)
),
@ -142,9 +143,15 @@ class ParserTest extends TestCase
$this->createGetAttrNode(
$this->createGetAttrNode(
$this->createGetAttrNode(new Node\NameNode('foo'), 'bar', Node\GetAttrNode::METHOD_CALL),
'foo', Node\GetAttrNode::METHOD_CALL),
'baz', Node\GetAttrNode::PROPERTY_CALL),
'3', Node\GetAttrNode::ARRAY_CALL),
'foo',
Node\GetAttrNode::METHOD_CALL
),
'baz',
Node\GetAttrNode::PROPERTY_CALL
),
'3',
Node\GetAttrNode::ARRAY_CALL
),
'foo.bar().foo().baz[3]',
['foo'],
],

3
console/skel/symfony/filesystem/Filesystem.php
View file

@ -601,7 +601,8 @@ class Filesystem
public function isAbsolutePath($file)
{
return strspn($file, '/\\', 0, 1)
|| (\strlen($file) > 3 && ctype_alpha($file[0])
|| (
\strlen($file) > 3 && ctype_alpha($file[0])
&& ':' === $file[1]
&& strspn($file, '/\\', 2, 1)
)

14
console/skel/symfony/finder/Symfony/Component/Finder/Adapter/AbstractFindAdapter.php
View file

@ -94,8 +94,12 @@ abstract class AbstractFindAdapter extends AbstractAdapter
$command->setErrorHandler(
$this->ignoreUnreadableDirs
// If directory is unreadable and finder is set to ignore it, `stderr` is ignored.
? function ($stderr) { return; }
: function ($stderr) { throw new AccessDeniedException($stderr); }
? function ($stderr) {
return;
}
: function ($stderr) {
throw new AccessDeniedException($stderr);
}
);
$paths = $this->shell->testCommand('uniq') ? $command->add('| uniq')->execute() : array_unique($command->execute());
@ -181,7 +185,8 @@ abstract class AbstractFindAdapter extends AbstractAdapter
$command
->add($i > 0 ? '-or' : null)
->add($expr->isRegex()
->add(
$expr->isRegex()
? ($expr->isCaseSensitive() ? '-regex' : '-iregex')
: ($expr->isCaseSensitive() ? '-name' : '-iname')
)
@ -223,7 +228,8 @@ abstract class AbstractFindAdapter extends AbstractAdapter
$command
->add($i > 0 ? '-or' : null)
->add($expr->isRegex()
->add(
$expr->isRegex()
? ($expr->isCaseSensitive() ? '-regex' : '-iregex')
: ($expr->isCaseSensitive() ? '-path' : '-ipath')
)

4
console/skel/symfony/finder/Symfony/Component/Finder/Shell/Command.php
View file

@ -273,7 +273,9 @@ class Command
array_map(function ($bit) {
return $bit instanceof Command ? $bit->join() : ($bit ?: null);
}, $this->bits),
function ($bit) { return null !== $bit; }
function ($bit) {
return null !== $bit;
}
));
}

16
console/skel/symfony/finder/Symfony/Component/Finder/Tests/FinderTest.php
View file

@ -264,7 +264,9 @@ class FinderTest extends Iterator\RealIteratorTestCase
public function testSort($adapter)
{
$finder = $this->buildFinder($adapter);
$this->assertSame($finder, $finder->sort(function (\SplFileInfo $a, \SplFileInfo $b) { return strcmp($a->getRealpath(), $b->getRealpath()); }));
$this->assertSame($finder, $finder->sort(function (\SplFileInfo $a, \SplFileInfo $b) {
return strcmp($a->getRealpath(), $b->getRealpath());
}));
$this->assertIterator($this->toAbsolute(array('foo', 'foo bar', 'foo/bar.tmp', 'test.php', 'test.py', 'toto')), $finder->in(self::$tmpDir)->getIterator());
}
@ -274,7 +276,9 @@ class FinderTest extends Iterator\RealIteratorTestCase
public function testFilter($adapter)
{
$finder = $this->buildFinder($adapter);
$this->assertSame($finder, $finder->filter(function (\SplFileInfo $f) { return preg_match('/test/', $f) > 0; }));
$this->assertSame($finder, $finder->filter(function (\SplFileInfo $f) {
return preg_match('/test/', $f) > 0;
}));
$this->assertIterator($this->toAbsolute(array('test.php', 'test.py')), $finder->in(self::$tmpDir)->getIterator());
}
@ -374,7 +378,9 @@ class FinderTest extends Iterator\RealIteratorTestCase
$finder = $this->buildFinder($adapter);
$a = iterator_to_array($finder->directories()->in(self::$tmpDir));
$a = array_values(array_map(function ($a) { return (string) $a; }, $a));
$a = array_values(array_map(function ($a) {
return (string) $a;
}, $a));
sort($a);
$this->assertEquals($expected, $a, 'implements the \IteratorAggregate interface');
}
@ -632,7 +638,9 @@ class FinderTest extends Iterator\RealIteratorTestCase
public function getAdaptersTestData()
{
return array_map(
function ($adapter) { return array($adapter); },
function ($adapter) {
return array($adapter);
},
$this->getValidAdapters()
);
}

8
console/skel/symfony/finder/Symfony/Component/Finder/Tests/Iterator/CustomFilterIteratorTest.php
View file

@ -38,8 +38,12 @@ class CustomFilterIteratorTest extends IteratorTestCase
public function getAcceptData()
{
return array(
array(array(function (\SplFileInfo $fileinfo) { return false; }), array()),
array(array(function (\SplFileInfo $fileinfo) { return preg_match('/^test/', $fileinfo) > 0; }), array('test.php', 'test.py')),
array(array(function (\SplFileInfo $fileinfo) {
return false;
}), array()),
array(array(function (\SplFileInfo $fileinfo) {
return preg_match('/^test/', $fileinfo) > 0;
}), array('test.php', 'test.py')),
array(array('is_dir'), array()),
);
}

12
console/skel/symfony/finder/Symfony/Component/Finder/Tests/Iterator/FilecontentFilterIteratorTest.php
View file

@ -49,28 +49,32 @@ class FilecontentFilterIteratorTest extends IteratorTestCase
{
$inner = new MockFileListIterator();
$inner[] = new MockSplFileInfo(array(
$inner[] = new MockSplFileInfo(
array(
'name' => 'a.txt',
'contents' => 'Lorem ipsum...',
'type' => 'file',
'mode' => 'r+', )
);
$inner[] = new MockSplFileInfo(array(
$inner[] = new MockSplFileInfo(
array(
'name' => 'b.yml',
'contents' => 'dolor sit...',
'type' => 'file',
'mode' => 'r+', )
);
$inner[] = new MockSplFileInfo(array(
$inner[] = new MockSplFileInfo(
array(
'name' => 'some/other/dir/third.php',
'contents' => 'amet...',
'type' => 'file',
'mode' => 'r+', )
);
$inner[] = new MockSplFileInfo(array(
$inner[] = new MockSplFileInfo(
array(
'name' => 'unreadable-file.txt',
'contents' => false,
'type' => 'file',

5
console/skel/symfony/finder/Symfony/Component/Finder/Tests/Iterator/FilterIteratorTest.php
View file

@ -24,10 +24,11 @@ class FilterIteratorTest extends RealIteratorTestCase
$i = $this->getMockForAbstractClass('Symfony\Component\Finder\Iterator\FilterIterator', array($i));
$i->expects($this->any())
->method('accept')
->will($this->returnCallback(function () use ($i) {
->will(
$this->returnCallback(function () use ($i) {
return (bool) preg_match('/\.php/', (string) $i->current());
})
);
);
$c = 0;
foreach ($i as $item) {

16
console/skel/symfony/finder/Symfony/Component/Finder/Tests/Iterator/IteratorTestCase.php
View file

@ -17,9 +17,13 @@ abstract class IteratorTestCase extends \PHPUnit_Framework_TestCase
{
// set iterator_to_array $use_key to false to avoid values merge
// this made FinderTest::testAppendWithAnArray() failed with GnuFinderAdapter
$values = array_map(function (\SplFileInfo $fileinfo) { return str_replace('/', DIRECTORY_SEPARATOR, $fileinfo->getPathname()); }, iterator_to_array($iterator, false));
$values = array_map(function (\SplFileInfo $fileinfo) {
return str_replace('/', DIRECTORY_SEPARATOR, $fileinfo->getPathname());
}, iterator_to_array($iterator, false));
$expected = array_map(function ($path) { return str_replace('/', DIRECTORY_SEPARATOR, $path); }, $expected);
$expected = array_map(function ($path) {
return str_replace('/', DIRECTORY_SEPARATOR, $path);
}, $expected);
sort($values);
sort($expected);
@ -29,7 +33,9 @@ abstract class IteratorTestCase extends \PHPUnit_Framework_TestCase
protected function assertOrderedIterator($expected, \Traversable $iterator)
{
$values = array_map(function (\SplFileInfo $fileinfo) { return $fileinfo->getPathname(); }, iterator_to_array($iterator));
$values = array_map(function (\SplFileInfo $fileinfo) {
return $fileinfo->getPathname();
}, iterator_to_array($iterator));
$this->assertEquals($expected, array_values($values));
}
@ -46,7 +52,9 @@ abstract class IteratorTestCase extends \PHPUnit_Framework_TestCase
*/
protected function assertOrderedIteratorForGroups($expected, \Traversable $iterator)
{
$values = array_values(array_map(function (\SplFileInfo $fileinfo) { return $fileinfo->getPathname(); }, iterator_to_array($iterator)));
$values = array_values(array_map(function (\SplFileInfo $fileinfo) {
return $fileinfo->getPathname();
}, iterator_to_array($iterator)));
foreach ($expected as $subarray) {
$temp = array();

4
console/skel/symfony/finder/Symfony/Component/Finder/Tests/Iterator/MockFileListIterator.php
View file

@ -15,7 +15,9 @@ class MockFileListIterator extends \ArrayIterator
{
public function __construct(array $filesArray = array())
{
$files = array_map(function ($file) { return new MockSplFileInfo($file); }, $filesArray);
$files = array_map(function ($file) {
return new MockSplFileInfo($file);
}, $filesArray);
parent::__construct($files);
}
}

2
console/skel/symfony/finder/Symfony/Component/Finder/Tests/Iterator/MockSplFileInfo.php
View file

@ -96,11 +96,13 @@ class MockSplFileInfo extends \SplFileInfo
switch ($type) {
case 'directory':
$this->type = self::TYPE_DIRECTORY;
// no break
case 'd':
$this->type = self::TYPE_DIRECTORY;
break;
case 'file':
$this->type = self::TYPE_FILE;
// no break
case 'f':
$this->type = self::TYPE_FILE;
break;

10
console/skel/symfony/finder/Symfony/Component/Finder/Tests/Iterator/SortableIteratorTest.php
View file

@ -32,17 +32,17 @@ class SortableIteratorTest extends RealIteratorTestCase
{
if (!is_callable($mode)) {
switch ($mode) {
case SortableIterator::SORT_BY_ACCESSED_TIME :
case SortableIterator::SORT_BY_ACCESSED_TIME:
file_get_contents(self::toAbsolute('.git'));
sleep(1);
file_get_contents(self::toAbsolute('.bar'));
break;
case SortableIterator::SORT_BY_CHANGED_TIME :
case SortableIterator::SORT_BY_CHANGED_TIME:
file_put_contents(self::toAbsolute('test.php'), 'foo');
sleep(1);
file_put_contents(self::toAbsolute('test.py'), 'foo');
break;
case SortableIterator::SORT_BY_MODIFIED_TIME :
case SortableIterator::SORT_BY_MODIFIED_TIME:
file_put_contents(self::toAbsolute('test.php'), 'foo');
sleep(1);
file_put_contents(self::toAbsolute('test.py'), 'foo');
@ -163,7 +163,9 @@ class SortableIteratorTest extends RealIteratorTestCase
array(SortableIterator::SORT_BY_ACCESSED_TIME, $this->toAbsolute($sortByAccessedTime)),
array(SortableIterator::SORT_BY_CHANGED_TIME, $this->toAbsolute($sortByChangedTime)),
array(SortableIterator::SORT_BY_MODIFIED_TIME, $this->toAbsolute($sortByModifiedTime)),
array(function (\SplFileInfo $a, \SplFileInfo $b) { return strcmp($a->getRealpath(), $b->getRealpath()); }, $this->toAbsolute($customComparison)),
array(function (\SplFileInfo $a, \SplFileInfo $b) {
return strcmp($a->getRealpath(), $b->getRealpath());
}, $this->toAbsolute($customComparison)),
);
}
}

4
console/skel/symfony/http-foundation/File/File.php
View file

@ -93,7 +93,9 @@ class File extends \SplFileInfo
{
$target = $this->getTargetFile($directory, $name);
set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
set_error_handler(function ($type, $msg) use (&$error) {
$error = $msg;
});
$renamed = rename($this->getPathname(), $target);
restore_error_handler();
if (!$renamed) {

4
console/skel/symfony/http-foundation/File/UploadedFile.php
View file

@ -192,7 +192,9 @@ class UploadedFile extends File
$target = $this->getTargetFile($directory, $name);
set_error_handler(function ($type, $msg) use (&$error) { $error = $msg; });
set_error_handler(function ($type, $msg) use (&$error) {
$error = $msg;
});
$moved = move_uploaded_file($this->getPathname(), $target);
restore_error_handler();
if (!$moved) {

4
console/skel/symfony/http-foundation/JsonResponse.php
View file

@ -123,7 +123,9 @@ class JsonResponse extends Response
// PHP 5.3 triggers annoying warnings for some
// types that can't be serialized as JSON (INF, resources, etc.)
// but doesn't provide the JsonSerializable interface.
set_error_handler(function () { return false; });
set_error_handler(function () {
return false;
});
$data = @json_encode($data, $this->encodingOptions);
restore_error_handler();
} elseif (\PHP_VERSION_ID < 50500) {

3
console/skel/symfony/http-foundation/RedirectResponse.php
View file

@ -96,7 +96,8 @@ class RedirectResponse extends Response
<body>
Redirecting to <a href="%1$s">%1$s</a>.
</body>
</html>', htmlspecialchars($url, ENT_QUOTES, 'UTF-8')));
</html>', htmlspecialchars($url, ENT_QUOTES, 'UTF-8'))
);
$this->headers->set('Location', $url);

2
console/skel/symfony/http-foundation/Tests/File/MimeType/MimeTypeTest.php
View file

@ -27,7 +27,7 @@ class MimeTypeTest extends TestCase
try {
$this->assertEquals('image/gif', MimeTypeGuesser::getInstance()->guess('-test'));
chdir($cwd);
} catch(\Exception $e) {
} catch (\Exception $e) {
chdir($cwd);
throw $e;
}

10
console/skel/symfony/http-foundation/Tests/RequestTest.php
View file

@ -218,13 +218,19 @@ class RequestTest extends TestCase
$this->assertEquals(array('foo' => ''), $request->query->all());
// assume rewrite rule: (.*) --> app/app.php; app/ is a symlink to a symfony web/ directory
$request = Request::create('http://test.com/apparthotel-1234', 'GET', array(), array(), array(),
$request = Request::create(
'http://test.com/apparthotel-1234',
'GET',
array(),
array(),
array(),
array(
'DOCUMENT_ROOT' => '/var/www/www.test.com',
'SCRIPT_FILENAME' => '/var/www/www.test.com/app/app.php',
'SCRIPT_NAME' => '/app/app.php',
'PHP_SELF' => '/app/app.php/apparthotel-1234',
));
)
);
$this->assertEquals('http://test.com/apparthotel-1234', $request->getUri());
$this->assertEquals('/apparthotel-1234', $request->getPathInfo());
$this->assertEquals('', $request->getQueryString());

18
console/skel/symfony/http-foundation/Tests/Session/Flash/AutoExpireFlashBagTest.php
View file

@ -106,16 +106,20 @@ class AutoExpireFlashBagTest extends TestCase
);
$this->bag->initialize($array);
$this->assertEquals(array(
$this->assertEquals(
array(
'notice' => 'Foo',
'error' => 'Bar',
), $this->bag->peekAll()
),
$this->bag->peekAll()
);
$this->assertEquals(array(
$this->assertEquals(
array(
'notice' => 'Foo',
'error' => 'Bar',
), $this->bag->peekAll()
),
$this->bag->peekAll()
);
}
@ -138,9 +142,11 @@ class AutoExpireFlashBagTest extends TestCase
{
$this->bag->set('notice', 'Foo');
$this->bag->set('error', 'Bar');
$this->assertEquals(array(
$this->assertEquals(
array(
'notice' => array('A previous flash message'),
), $this->bag->all()
),
$this->bag->all()
);
$this->assertEquals(array(), $this->bag->all());

18
console/skel/symfony/http-foundation/Tests/Session/Flash/FlashBagTest.php
View file

@ -98,9 +98,11 @@ class FlashBagTest extends TestCase
{
$this->bag->set('notice', 'Foo');
$this->bag->set('error', 'Bar');
$this->assertEquals(array(
$this->assertEquals(
array(
'notice' => array('Foo'),
'error' => array('Bar'), ), $this->bag->all()
'error' => array('Bar'), ),
$this->bag->all()
);
$this->assertEquals(array(), $this->bag->all());
@ -141,17 +143,21 @@ class FlashBagTest extends TestCase
{
$this->bag->set('notice', 'Foo');
$this->bag->set('error', 'Bar');
$this->assertEquals(array(
$this->assertEquals(
array(
'notice' => array('Foo'),
'error' => array('Bar'),
), $this->bag->peekAll()
),
$this->bag->peekAll()
);
$this->assertTrue($this->bag->has('notice'));
$this->assertTrue($this->bag->has('error'));
$this->assertEquals(array(
$this->assertEquals(
array(
'notice' => array('Foo'),
'error' => array('Bar'),
), $this->bag->peekAll()
),
$this->bag->peekAll()
);
}

45
console/skel/symfony/http-foundation/Tests/StreamedResponseTest.php
View file

@ -19,7 +19,9 @@ class StreamedResponseTest extends TestCase
{
public function testConstructor()
{
$response = new StreamedResponse(function () { echo 'foo'; }, 404, array('Content-Type' => 'text/plain'));
$response = new StreamedResponse(function () {
echo 'foo';
}, 404, array('Content-Type' => 'text/plain'));
$this->assertEquals(404, $response->getStatusCode());
$this->assertEquals('text/plain', $response->headers->get('Content-Type'));
@ -27,7 +29,9 @@ class StreamedResponseTest extends TestCase
public function testPrepareWith11Protocol()
{
$response = new StreamedResponse(function () { echo 'foo'; });
$response = new StreamedResponse(function () {
echo 'foo';
});
$request = Request::create('/');
$request->server->set('SERVER_PROTOCOL', 'HTTP/1.1');
@ -39,7 +43,9 @@ class StreamedResponseTest extends TestCase
public function testPrepareWith10Protocol()
{
$response = new StreamedResponse(function () { echo 'foo'; });
$response = new StreamedResponse(function () {
echo 'foo';
});
$request = Request::create('/');
$request->server->set('SERVER_PROTOCOL', 'HTTP/1.0');
@ -51,7 +57,9 @@ class StreamedResponseTest extends TestCase
public function testPrepareWithHeadRequest()
{
$response = new StreamedResponse(function () { echo 'foo'; }, 200, array('Content-Length' => '123'));
$response = new StreamedResponse(function () {
echo 'foo';
}, 200, array('Content-Length' => '123'));
$request = Request::create('/', 'HEAD');
$response->prepare($request);
@ -61,7 +69,9 @@ class StreamedResponseTest extends TestCase
public function testPrepareWithCacheHeaders()
{
$response = new StreamedResponse(function () { echo 'foo'; }, 200, array('Cache-Control' => 'max-age=600, public'));
$response = new StreamedResponse(function () {
echo 'foo';
}, 200, array('Cache-Control' => 'max-age=600, public'));
$request = Request::create('/', 'GET');
$response->prepare($request);
@ -72,7 +82,9 @@ class StreamedResponseTest extends TestCase
{
$called = 0;
$response = new StreamedResponse(function () use (&$called) { ++$called; });
$response = new StreamedResponse(function () use (&$called) {
++$called;
});
$response->sendContent();
$this->assertEquals(1, $called);
@ -104,19 +116,24 @@ class StreamedResponseTest extends TestCase
*/
public function testSetContent()
{
$response = new StreamedResponse(function () { echo 'foo'; });
$response = new StreamedResponse(function () {
echo 'foo';
});
$response->setContent('foo');
}
public function testGetContent()
{
$response = new StreamedResponse(function () { echo 'foo'; });
$response = new StreamedResponse(function () {
echo 'foo';
});
$this->assertFalse($response->getContent());
}
public function testCreate()
{
$response = StreamedResponse::create(function () {}, 204);
$response = StreamedResponse::create(function () {
}, 204);
$this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response);
$this->assertEquals(204, $response->getStatusCode());
@ -124,18 +141,22 @@ class StreamedResponseTest extends TestCase
public function testReturnThis()
{
$response = new StreamedResponse(function () {});
$response = new StreamedResponse(function () {
});
$this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendContent());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendContent());
$response = new StreamedResponse(function () {});
$response = new StreamedResponse(function () {
});
$this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendHeaders());
$this->assertInstanceOf('Symfony\Component\HttpFoundation\StreamedResponse', $response->sendHeaders());
}
public function testSetNotModified()
{
$response = new StreamedResponse(function () { echo 'foo'; });
$response = new StreamedResponse(function () {
echo 'foo';
});
$modified = $response->setNotModified();
$this->assertObjectHasAttribute('headers', $modified);
$this->assertObjectHasAttribute('content', $modified);

55
console/skel/symfony/polyfill-ctype/bootstrap.php
View file

@ -12,15 +12,48 @@
use Symfony\Polyfill\Ctype as p;
if (!function_exists('ctype_alnum')) {
function ctype_alnum($text) { return p\Ctype::ctype_alnum($text); }
function ctype_alpha($text) { return p\Ctype::ctype_alpha($text); }
function ctype_cntrl($text) { return p\Ctype::ctype_cntrl($text); }
function ctype_digit($text) { return p\Ctype::ctype_digit($text); }
function ctype_graph($text) { return p\Ctype::ctype_graph($text); }
function ctype_lower($text) { return p\Ctype::ctype_lower($text); }
function ctype_print($text) { return p\Ctype::ctype_print($text); }
function ctype_punct($text) { return p\Ctype::ctype_punct($text); }
function ctype_space($text) { return p\Ctype::ctype_space($text); }
function ctype_upper($text) { return p\Ctype::ctype_upper($text); }
function ctype_xdigit($text) { return p\Ctype::ctype_xdigit($text); }
function ctype_alnum($text)
{
return p\Ctype::ctype_alnum($text);
}
function ctype_alpha($text)
{
return p\Ctype::ctype_alpha($text);
}
function ctype_cntrl($text)
{
return p\Ctype::ctype_cntrl($text);
}
function ctype_digit($text)
{
return p\Ctype::ctype_digit($text);
}
function ctype_graph($text)
{
return p\Ctype::ctype_graph($text);
}
function ctype_lower($text)
{
return p\Ctype::ctype_lower($text);
}
function ctype_print($text)
{
return p\Ctype::ctype_print($text);
}
function ctype_punct($text)
{
return p\Ctype::ctype_punct($text);
}
function ctype_space($text)
{
return p\Ctype::ctype_space($text);
}
function ctype_upper($text)
{
return p\Ctype::ctype_upper($text);
}
function ctype_xdigit($text)
{
return p\Ctype::ctype_xdigit($text);
}
}

191
console/skel/symfony/polyfill-mbstring/bootstrap.php
View file

@ -16,47 +16,162 @@ if (!function_exists('mb_strlen')) {
define('MB_CASE_LOWER', 1);
define('MB_CASE_TITLE', 2);
function mb_convert_encoding($s, $to, $from = null) { return p\Mbstring::mb_convert_encoding($s, $to, $from); }
function mb_decode_mimeheader($s) { return p\Mbstring::mb_decode_mimeheader($s); }
function mb_encode_mimeheader($s, $charset = null, $transferEnc = null, $lf = null, $indent = null) { return p\Mbstring::mb_encode_mimeheader($s, $charset, $transferEnc, $lf, $indent); }
function mb_decode_numericentity($s, $convmap, $enc = null) { return p\Mbstring::mb_decode_numericentity($s, $convmap, $enc); }
function mb_encode_numericentity($s, $convmap, $enc = null, $is_hex = false) { return p\Mbstring::mb_encode_numericentity($s, $convmap, $enc, $is_hex); }
function mb_convert_case($s, $mode, $enc = null) { return p\Mbstring::mb_convert_case($s, $mode, $enc); }
function mb_internal_encoding($enc = null) { return p\Mbstring::mb_internal_encoding($enc); }
function mb_language($lang = null) { return p\Mbstring::mb_language($lang); }
function mb_list_encodings() { return p\Mbstring::mb_list_encodings(); }
function mb_encoding_aliases($encoding) { return p\Mbstring::mb_encoding_aliases($encoding); }
function mb_check_encoding($var = null, $encoding = null) { return p\Mbstring::mb_check_encoding($var, $encoding); }
function mb_detect_encoding($str, $encodingList = null, $strict = false) { return p\Mbstring::mb_detect_encoding($str, $encodingList, $strict); }
function mb_detect_order($encodingList = null) { return p\Mbstring::mb_detect_order($encodingList); }
function mb_parse_str($s, &$result = array()) { parse_str($s, $result); }
function mb_strlen($s, $enc = null) { return p\Mbstring::mb_strlen($s, $enc); }
function mb_strpos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strpos($s, $needle, $offset, $enc); }
function mb_strtolower($s, $enc = null) { return p\Mbstring::mb_strtolower($s, $enc); }
function mb_strtoupper($s, $enc = null) { return p\Mbstring::mb_strtoupper($s, $enc); }
function mb_substitute_character($char = null) { return p\Mbstring::mb_substitute_character($char); }
function mb_substr($s, $start, $length = 2147483647, $enc = null) { return p\Mbstring::mb_substr($s, $start, $length, $enc); }
function mb_stripos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_stripos($s, $needle, $offset, $enc); }
function mb_stristr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_stristr($s, $needle, $part, $enc); }
function mb_strrchr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strrchr($s, $needle, $part, $enc); }
function mb_strrichr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strrichr($s, $needle, $part, $enc); }
function mb_strripos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strripos($s, $needle, $offset, $enc); }
function mb_strrpos($s, $needle, $offset = 0, $enc = null) { return p\Mbstring::mb_strrpos($s, $needle, $offset, $enc); }
function mb_strstr($s, $needle, $part = false, $enc = null) { return p\Mbstring::mb_strstr($s, $needle, $part, $enc); }
function mb_get_info($type = 'all') { return p\Mbstring::mb_get_info($type); }
function mb_http_output($enc = null) { return p\Mbstring::mb_http_output($enc); }
function mb_strwidth($s, $enc = null) { return p\Mbstring::mb_strwidth($s, $enc); }
function mb_substr_count($haystack, $needle, $enc = null) { return p\Mbstring::mb_substr_count($haystack, $needle, $enc); }
function mb_output_handler($contents, $status) { return p\Mbstring::mb_output_handler($contents, $status); }
function mb_http_input($type = '') { return p\Mbstring::mb_http_input($type); }
function mb_convert_variables($toEncoding, $fromEncoding, &$a = null, &$b = null, &$c = null, &$d = null, &$e = null, &$f = null) { return p\Mbstring::mb_convert_variables($toEncoding, $fromEncoding, $a, $b, $c, $d, $e, $f); }
function mb_convert_encoding($s, $to, $from = null)
{
return p\Mbstring::mb_convert_encoding($s, $to, $from);
}
function mb_decode_mimeheader($s)
{
return p\Mbstring::mb_decode_mimeheader($s);
}
function mb_encode_mimeheader($s, $charset = null, $transferEnc = null, $lf = null, $indent = null)
{
return p\Mbstring::mb_encode_mimeheader($s, $charset, $transferEnc, $lf, $indent);
}
function mb_decode_numericentity($s, $convmap, $enc = null)
{
return p\Mbstring::mb_decode_numericentity($s, $convmap, $enc);
}
function mb_encode_numericentity($s, $convmap, $enc = null, $is_hex = false)
{
return p\Mbstring::mb_encode_numericentity($s, $convmap, $enc, $is_hex);
}
function mb_convert_case($s, $mode, $enc = null)
{
return p\Mbstring::mb_convert_case($s, $mode, $enc);
}
function mb_internal_encoding($enc = null)
{
return p\Mbstring::mb_internal_encoding($enc);
}
function mb_language($lang = null)
{
return p\Mbstring::mb_language($lang);
}
function mb_list_encodings()
{
return p\Mbstring::mb_list_encodings();
}
function mb_encoding_aliases($encoding)
{
return p\Mbstring::mb_encoding_aliases($encoding);
}
function mb_check_encoding($var = null, $encoding = null)
{
return p\Mbstring::mb_check_encoding($var, $encoding);
}
function mb_detect_encoding($str, $encodingList = null, $strict = false)
{
return p\Mbstring::mb_detect_encoding($str, $encodingList, $strict);
}
function mb_detect_order($encodingList = null)
{
return p\Mbstring::mb_detect_order($encodingList);
}
function mb_parse_str($s, &$result = array())
{
parse_str($s, $result);
}
function mb_strlen($s, $enc = null)
{
return p\Mbstring::mb_strlen($s, $enc);
}
function mb_strpos($s, $needle, $offset = 0, $enc = null)
{
return p\Mbstring::mb_strpos($s, $needle, $offset, $enc);
}
function mb_strtolower($s, $enc = null)
{
return p\Mbstring::mb_strtolower($s, $enc);
}
function mb_strtoupper($s, $enc = null)
{
return p\Mbstring::mb_strtoupper($s, $enc);
}
function mb_substitute_character($char = null)
{
return p\Mbstring::mb_substitute_character($char);
}
function mb_substr($s, $start, $length = 2147483647, $enc = null)
{
return p\Mbstring::mb_substr($s, $start, $length, $enc);
}
function mb_stripos($s, $needle, $offset = 0, $enc = null)
{
return p\Mbstring::mb_stripos($s, $needle, $offset, $enc);
}
function mb_stristr($s, $needle, $part = false, $enc = null)
{
return p\Mbstring::mb_stristr($s, $needle, $part, $enc);
}
function mb_strrchr($s, $needle, $part = false, $enc = null)
{
return p\Mbstring::mb_strrchr($s, $needle, $part, $enc);
}
function mb_strrichr($s, $needle, $part = false, $enc = null)
{
return p\Mbstring::mb_strrichr($s, $needle, $part, $enc);
}
function mb_strripos($s, $needle, $offset = 0, $enc = null)
{
return p\Mbstring::mb_strripos($s, $needle, $offset, $enc);
}
function mb_strrpos($s, $needle, $offset = 0, $enc = null)
{
return p\Mbstring::mb_strrpos($s, $needle, $offset, $enc);
}
function mb_strstr($s, $needle, $part = false, $enc = null)
{
return p\Mbstring::mb_strstr($s, $needle, $part, $enc);
}
function mb_get_info($type = 'all')
{
return p\Mbstring::mb_get_info($type);
}
function mb_http_output($enc = null)
{
return p\Mbstring::mb_http_output($enc);
}
function mb_strwidth($s, $enc = null)
{
return p\Mbstring::mb_strwidth($s, $enc);
}
function mb_substr_count($haystack, $needle, $enc = null)
{
return p\Mbstring::mb_substr_count($haystack, $needle, $enc);
}
function mb_output_handler($contents, $status)
{
return p\Mbstring::mb_output_handler($contents, $status);
}
function mb_http_input($type = '')
{
return p\Mbstring::mb_http_input($type);
}
function mb_convert_variables($toEncoding, $fromEncoding, &$a = null, &$b = null, &$c = null, &$d = null, &$e = null, &$f = null)
{
return p\Mbstring::mb_convert_variables($toEncoding, $fromEncoding, $a, $b, $c, $d, $e, $f);
}
}
if (!function_exists('mb_chr')) {
function mb_ord($s, $enc = null) { return p\Mbstring::mb_ord($s, $enc); }
function mb_chr($code, $enc = null) { return p\Mbstring::mb_chr($code, $enc); }
function mb_scrub($s, $enc = null) { $enc = null === $enc ? mb_internal_encoding() : $enc; return mb_convert_encoding($s, $enc, $enc); }
function mb_ord($s, $enc = null)
{
return p\Mbstring::mb_ord($s, $enc);
}
function mb_chr($code, $enc = null)
{
return p\Mbstring::mb_chr($code, $enc);
}
function mb_scrub($s, $enc = null)
{
$enc = null === $enc ? mb_internal_encoding() : $enc;
return mb_convert_encoding($s, $enc, $enc);
}
}
if (!function_exists('mb_str_split')) {
function mb_str_split($string, $split_length = 1, $encoding = null) { return p\Mbstring::mb_str_split($string, $split_length, $encoding); }
function mb_str_split($string, $split_length = 1, $encoding = null)
{
return p\Mbstring::mb_str_split($string, $split_length, $encoding);
}
}

15
console/skel/symfony/polyfill-php54/bootstrap.php
View file

@ -13,7 +13,10 @@ use Symfony\Polyfill\Php54 as p;
if (PHP_VERSION_ID < 50400) {
if (!function_exists('trait_exists')) {
function trait_exists($class, $autoload = true) { return $autoload && \class_exists($class, $autoload) && false; }
function trait_exists($class, $autoload = true)
{
return $autoload && \class_exists($class, $autoload) && false;
}
}
if (!function_exists('class_uses')) {
function class_uses($class, $autoload = true)
@ -26,9 +29,15 @@ if (PHP_VERSION_ID < 50400) {
}
}
if (!function_exists('hex2bin')) {
function hex2bin($data) { return p\Php54::hex2bin($data); }
function hex2bin($data)
{
return p\Php54::hex2bin($data);
}
}
if (!function_exists('session_register_shutdown')) {
function session_register_shutdown() { register_shutdown_function('session_write_close'); }
function session_register_shutdown()
{
register_shutdown_function('session_write_close');
}
}
}

20
console/skel/symfony/polyfill-php55/bootstrap.php
View file

@ -13,15 +13,27 @@ use Symfony\Polyfill\Php55 as p;
if (PHP_VERSION_ID < 50500) {
if (!function_exists('boolval')) {
function boolval($val) { return p\Php55::boolval($val); }
function boolval($val)
{
return p\Php55::boolval($val);
}
}
if (!function_exists('json_last_error_msg')) {
function json_last_error_msg() { return p\Php55::json_last_error_msg(); }
function json_last_error_msg()
{
return p\Php55::json_last_error_msg();
}
}
if (!function_exists('array_column')) {
function array_column($array, $columnKey, $indexKey = null) { return p\Php55ArrayColumn::array_column($array, $columnKey, $indexKey); }
function array_column($array, $columnKey, $indexKey = null)
{
return p\Php55ArrayColumn::array_column($array, $columnKey, $indexKey);
}
}
if (!function_exists('hash_pbkdf2')) {
function hash_pbkdf2($algorithm, $password, $salt, $iterations, $length = 0, $rawOutput = false) { return p\Php55::hash_pbkdf2($algorithm, $password, $salt, $iterations, $length, $rawOutput); }
function hash_pbkdf2($algorithm, $password, $salt, $iterations, $length = 0, $rawOutput = false)
{
return p\Php55::hash_pbkdf2($algorithm, $password, $salt, $iterations, $length, $rawOutput);
}
}
}

4
console/skel/symfony/polyfill-php70/Php70.php
View file

@ -53,7 +53,9 @@ final class Php70
{
static $handler;
if (!$handler) {
$handler = function () { return false; };
$handler = function () {
return false;
};
}
set_error_handler($handler);
@trigger_error('');

15
console/skel/symfony/polyfill-php70/bootstrap.php
View file

@ -16,12 +16,21 @@ if (PHP_VERSION_ID < 70000) {
define('PHP_INT_MIN', ~PHP_INT_MAX);
}
if (!function_exists('intdiv')) {
function intdiv($dividend, $divisor) { return p\Php70::intdiv($dividend, $divisor); }
function intdiv($dividend, $divisor)
{
return p\Php70::intdiv($dividend, $divisor);
}
}
if (!function_exists('preg_replace_callback_array')) {
function preg_replace_callback_array(array $patterns, $subject, $limit = -1, &$count = 0) { return p\Php70::preg_replace_callback_array($patterns, $subject, $limit, $count); }
function preg_replace_callback_array(array $patterns, $subject, $limit = -1, &$count = 0)
{
return p\Php70::preg_replace_callback_array($patterns, $subject, $limit, $count);
}
}
if (!function_exists('error_clear_last')) {
function error_clear_last() { return p\Php70::error_clear_last(); }
function error_clear_last()
{
return p\Php70::error_clear_last();
}
}
}

6
console/skel/symfony/routing/Router.php
View file

@ -284,7 +284,8 @@ class Router implements RouterInterface, RequestMatcherInterface
return $this->matcher;
}
$cache = $this->getConfigCacheFactory()->cache($this->options['cache_dir'].'/'.$this->options['matcher_cache_class'].'.php',
$cache = $this->getConfigCacheFactory()->cache(
$this->options['cache_dir'].'/'.$this->options['matcher_cache_class'].'.php',
function (ConfigCacheInterface $cache) {
$dumper = $this->getMatcherDumperInstance();
if (method_exists($dumper, 'addExpressionLanguageProvider')) {
@ -323,7 +324,8 @@ class Router implements RouterInterface, RequestMatcherInterface
if (null === $this->options['cache_dir'] || null === $this->options['generator_cache_class']) {
$this->generator = new $this->options['generator_class']($this->getRouteCollection(), $this->context, $this->logger);
} else {
$cache = $this->getConfigCacheFactory()->cache($this->options['cache_dir'].'/'.$this->options['generator_cache_class'].'.php',
$cache = $this->getConfigCacheFactory()->cache(
$this->options['cache_dir'].'/'.$this->options['generator_cache_class'].'.php',
function (ConfigCacheInterface $cache) {
$dumper = $this->getGeneratorDumperInstance();

4
console/skel/symfony/routing/Tests/Fixtures/CustomXmlFileLoader.php
View file

@ -21,6 +21,8 @@ class CustomXmlFileLoader extends XmlFileLoader
{
protected function loadFile($file)
{
return XmlUtils::loadFile($file, function () { return true; });
return XmlUtils::loadFile($file, function () {
return true;
});
}
}

79
console/skel/symfony/routing/Tests/Fixtures/dumper/url_matcher1.php
View file

@ -31,20 +31,17 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
if (0 === strpos($pathinfo, '/foo')) {
// foo
if (preg_match('#^/foo/(?P<bar>baz|symfony)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo']), array ( 'def' => 'test',));
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo']), array( 'def' => 'test',));
}
// foofoo
if ('/foofoo' === $pathinfo) {
return array ( 'def' => 'test', '_route' => 'foofoo',);
return array( 'def' => 'test', '_route' => 'foofoo',);
}
}
elseif (0 === strpos($pathinfo, '/bar')) {
} elseif (0 === strpos($pathinfo, '/bar')) {
// bar
if (preg_match('#^/bar/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'bar']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'bar']), array());
if (!in_array($canonicalMethod, ['GET', 'HEAD'])) {
$allow = array_merge($allow, ['GET', 'HEAD']);
goto not_bar;
@ -56,7 +53,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
// barhead
if (0 === strpos($pathinfo, '/barhead') && preg_match('#^/barhead/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'barhead']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'barhead']), array());
if (!in_array($canonicalMethod, ['GET'])) {
$allow = array_merge($allow, ['GET']);
goto not_barhead;
@ -65,10 +62,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
return $ret;
}
not_barhead:
}
elseif (0 === strpos($pathinfo, '/test')) {
} elseif (0 === strpos($pathinfo, '/test')) {
if (0 === strpos($pathinfo, '/test/baz')) {
// baz
if ('/test/baz' === $pathinfo) {
@ -84,17 +78,16 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
if ('/test/baz3/' === $pathinfo) {
return ['_route' => 'baz3'];
}
}
// baz4
if (preg_match('#^/test/(?P<foo>[^/]++)/$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'baz4']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'baz4']), array());
}
// baz5
if (preg_match('#^/test/(?P<foo>[^/]++)/$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'baz5']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'baz5']), array());
if (!in_array($requestMethod, ['POST'])) {
$allow = array_merge($allow, ['POST']);
goto not_baz5;
@ -106,7 +99,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
// baz.baz6
if (preg_match('#^/test/(?P<foo>[^/]++)/$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'baz.baz6']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'baz.baz6']), array());
if (!in_array($requestMethod, ['PUT'])) {
$allow = array_merge($allow, ['PUT']);
goto not_bazbaz6;
@ -115,12 +108,11 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
return $ret;
}
not_bazbaz6:
}
// quoter
if (preg_match('#^/(?P<quoter>[\']+)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'quoter']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'quoter']), array());
}
// space
@ -132,40 +124,35 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
if (0 === strpos($pathinfo, '/a/b\'b')) {
// foo1
if (preg_match('#^/a/b\'b/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo1']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo1']), array());
}
// bar1
if (preg_match('#^/a/b\'b/(?P<bar>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'bar1']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'bar1']), array());
}
}
// overridden
if (preg_match('#^/a/(?P<var>.*)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'overridden']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'overridden']), array());
}
if (0 === strpos($pathinfo, '/a/b\'b')) {
// foo2
if (preg_match('#^/a/b\'b/(?P<foo1>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo2']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo2']), array());
}
// bar2
if (preg_match('#^/a/b\'b/(?P<bar1>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'bar2']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'bar2']), array());
}
}
}
elseif (0 === strpos($pathinfo, '/multi')) {
} elseif (0 === strpos($pathinfo, '/multi')) {
// helloWorld
if (0 === strpos($pathinfo, '/multi/hello') && preg_match('#^/multi/hello(?:/(?P<who>[^/]++))?$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'helloWorld']), array ( 'who' => 'World!',));
return $this->mergeDefaults(array_replace($matches, ['_route' => 'helloWorld']), array( 'who' => 'World!',));
}
// hey
@ -177,17 +164,16 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
if ('/multi/new' === $pathinfo) {
return ['_route' => 'overridden2'];
}
}
// foo3
if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo3']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo3']), array());
}
// bar3
if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P<bar>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'bar3']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'bar3']), array());
}
if (0 === strpos($pathinfo, '/aba')) {
@ -198,9 +184,8 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
// foo4
if (preg_match('#^/aba/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo4']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo4']), array());
}
}
$host = $context->getHost();
@ -215,7 +200,6 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
if ('/c2/route2' === $pathinfo) {
return ['_route' => 'route2'];
}
}
if (preg_match('#^b\\.example\\.com$#sDi', $host, $hostMatches)) {
@ -223,7 +207,6 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
if ('/c2/route3' === $pathinfo) {
return ['_route' => 'route3'];
}
}
if (preg_match('#^a\\.example\\.com$#sDi', $host, $hostMatches)) {
@ -231,7 +214,6 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
if ('/route4' === $pathinfo) {
return ['_route' => 'route4'];
}
}
if (preg_match('#^c\\.example\\.com$#sDi', $host, $hostMatches)) {
@ -239,7 +221,6 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
if ('/route5' === $pathinfo) {
return ['_route' => 'route5'];
}
}
// route6
@ -251,39 +232,36 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
if (0 === strpos($pathinfo, '/route1')) {
// route11
if ('/route11' === $pathinfo) {
return $this->mergeDefaults(array_replace($hostMatches, ['_route' => 'route11']), array ());
return $this->mergeDefaults(array_replace($hostMatches, ['_route' => 'route11']), array());
}
// route12
if ('/route12' === $pathinfo) {
return $this->mergeDefaults(array_replace($hostMatches, ['_route' => 'route12']), array ( 'var1' => 'val',));
return $this->mergeDefaults(array_replace($hostMatches, ['_route' => 'route12']), array( 'var1' => 'val',));
}
// route13
if (0 === strpos($pathinfo, '/route13') && preg_match('#^/route13/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($hostMatches, $matches, ['_route' => 'route13']), array ());
return $this->mergeDefaults(array_replace($hostMatches, $matches, ['_route' => 'route13']), array());
}
// route14
if (0 === strpos($pathinfo, '/route14') && preg_match('#^/route14/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($hostMatches, $matches, ['_route' => 'route14']), array ( 'var1' => 'val',));
return $this->mergeDefaults(array_replace($hostMatches, $matches, ['_route' => 'route14']), array( 'var1' => 'val',));
}
}
}
if (preg_match('#^c\\.example\\.com$#sDi', $host, $hostMatches)) {
// route15
if (0 === strpos($pathinfo, '/route15') && preg_match('#^/route15/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'route15']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'route15']), array());
}
}
// route16
if (0 === strpos($pathinfo, '/route16') && preg_match('#^/route16/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'route16']), array ( 'var1' => 'val',));
return $this->mergeDefaults(array_replace($matches, ['_route' => 'route16']), array( 'var1' => 'val',));
}
// route17
@ -299,14 +277,13 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
if (0 === strpos($pathinfo, '/a/b')) {
// b
if (preg_match('#^/a/b/(?P<var>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'b']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'b']), array());
}
// c
if (0 === strpos($pathinfo, '/a/b/c') && preg_match('#^/a/b/c/(?P<var>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'c']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'c']), array());
}
}
if ('/' === $pathinfo && !$allow) {

83
console/skel/symfony/routing/Tests/Fixtures/dumper/url_matcher2.php
View file

@ -31,20 +31,17 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
if (0 === strpos($pathinfo, '/foo')) {
// foo
if (preg_match('#^/foo/(?P<bar>baz|symfony)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo']), array ( 'def' => 'test',));
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo']), array( 'def' => 'test',));
}
// foofoo
if ('/foofoo' === $pathinfo) {
return array ( 'def' => 'test', '_route' => 'foofoo',);
return array( 'def' => 'test', '_route' => 'foofoo',);
}
}
elseif (0 === strpos($pathinfo, '/bar')) {
} elseif (0 === strpos($pathinfo, '/bar')) {
// bar
if (preg_match('#^/bar/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'bar']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'bar']), array());
if (!in_array($canonicalMethod, ['GET', 'HEAD'])) {
$allow = array_merge($allow, ['GET', 'HEAD']);
goto not_bar;
@ -56,7 +53,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
// barhead
if (0 === strpos($pathinfo, '/barhead') && preg_match('#^/barhead/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'barhead']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'barhead']), array());
if (!in_array($canonicalMethod, ['GET'])) {
$allow = array_merge($allow, ['GET']);
goto not_barhead;
@ -65,10 +62,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
return $ret;
}
not_barhead:
}
elseif (0 === strpos($pathinfo, '/test')) {
} elseif (0 === strpos($pathinfo, '/test')) {
if (0 === strpos($pathinfo, '/test/baz')) {
// baz
if ('/test/baz' === $pathinfo) {
@ -94,12 +88,11 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
return $ret;
}
not_baz3:
}
// baz4
if (preg_match('#^/test/(?P<foo>[^/]++)/?$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'baz4']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'baz4']), array());
if ('/' === substr($pathinfo, -1)) {
// no-op
} elseif ('GET' !== $canonicalMethod) {
@ -114,7 +107,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
// baz5
if (preg_match('#^/test/(?P<foo>[^/]++)/$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'baz5']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'baz5']), array());
if (!in_array($requestMethod, ['POST'])) {
$allow = array_merge($allow, ['POST']);
goto not_baz5;
@ -126,7 +119,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
// baz.baz6
if (preg_match('#^/test/(?P<foo>[^/]++)/$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'baz.baz6']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'baz.baz6']), array());
if (!in_array($requestMethod, ['PUT'])) {
$allow = array_merge($allow, ['PUT']);
goto not_bazbaz6;
@ -135,12 +128,11 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
return $ret;
}
not_bazbaz6:
}
// quoter
if (preg_match('#^/(?P<quoter>[\']+)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'quoter']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'quoter']), array());
}
// space
@ -152,40 +144,35 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
if (0 === strpos($pathinfo, '/a/b\'b')) {
// foo1
if (preg_match('#^/a/b\'b/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo1']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo1']), array());
}
// bar1
if (preg_match('#^/a/b\'b/(?P<bar>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'bar1']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'bar1']), array());
}
}
// overridden
if (preg_match('#^/a/(?P<var>.*)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'overridden']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'overridden']), array());
}
if (0 === strpos($pathinfo, '/a/b\'b')) {
// foo2
if (preg_match('#^/a/b\'b/(?P<foo1>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo2']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo2']), array());
}
// bar2
if (preg_match('#^/a/b\'b/(?P<bar1>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'bar2']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'bar2']), array());
}
}
}
elseif (0 === strpos($pathinfo, '/multi')) {
} elseif (0 === strpos($pathinfo, '/multi')) {
// helloWorld
if (0 === strpos($pathinfo, '/multi/hello') && preg_match('#^/multi/hello(?:/(?P<who>[^/]++))?$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'helloWorld']), array ( 'who' => 'World!',));
return $this->mergeDefaults(array_replace($matches, ['_route' => 'helloWorld']), array( 'who' => 'World!',));
}
// hey
@ -207,17 +194,16 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
if ('/multi/new' === $pathinfo) {
return ['_route' => 'overridden2'];
}
}
// foo3
if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo3']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo3']), array());
}
// bar3
if (preg_match('#^/(?P<_locale>[^/]++)/b/(?P<bar>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'bar3']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'bar3']), array());
}
if (0 === strpos($pathinfo, '/aba')) {
@ -228,9 +214,8 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
// foo4
if (preg_match('#^/aba/(?P<foo>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo4']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'foo4']), array());
}
}
$host = $context->getHost();
@ -245,7 +230,6 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
if ('/c2/route2' === $pathinfo) {
return ['_route' => 'route2'];
}
}
if (preg_match('#^b\\.example\\.com$#sDi', $host, $hostMatches)) {
@ -253,7 +237,6 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
if ('/c2/route3' === $pathinfo) {
return ['_route' => 'route3'];
}
}
if (preg_match('#^a\\.example\\.com$#sDi', $host, $hostMatches)) {
@ -261,7 +244,6 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
if ('/route4' === $pathinfo) {
return ['_route' => 'route4'];
}
}
if (preg_match('#^c\\.example\\.com$#sDi', $host, $hostMatches)) {
@ -269,7 +251,6 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
if ('/route5' === $pathinfo) {
return ['_route' => 'route5'];
}
}
// route6
@ -281,39 +262,36 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
if (0 === strpos($pathinfo, '/route1')) {
// route11
if ('/route11' === $pathinfo) {
return $this->mergeDefaults(array_replace($hostMatches, ['_route' => 'route11']), array ());
return $this->mergeDefaults(array_replace($hostMatches, ['_route' => 'route11']), array());
}
// route12
if ('/route12' === $pathinfo) {
return $this->mergeDefaults(array_replace($hostMatches, ['_route' => 'route12']), array ( 'var1' => 'val',));
return $this->mergeDefaults(array_replace($hostMatches, ['_route' => 'route12']), array( 'var1' => 'val',));
}
// route13
if (0 === strpos($pathinfo, '/route13') && preg_match('#^/route13/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($hostMatches, $matches, ['_route' => 'route13']), array ());
return $this->mergeDefaults(array_replace($hostMatches, $matches, ['_route' => 'route13']), array());
}
// route14
if (0 === strpos($pathinfo, '/route14') && preg_match('#^/route14/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($hostMatches, $matches, ['_route' => 'route14']), array ( 'var1' => 'val',));
return $this->mergeDefaults(array_replace($hostMatches, $matches, ['_route' => 'route14']), array( 'var1' => 'val',));
}
}
}
if (preg_match('#^c\\.example\\.com$#sDi', $host, $hostMatches)) {
// route15
if (0 === strpos($pathinfo, '/route15') && preg_match('#^/route15/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'route15']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'route15']), array());
}
}
// route16
if (0 === strpos($pathinfo, '/route16') && preg_match('#^/route16/(?P<name>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'route16']), array ( 'var1' => 'val',));
return $this->mergeDefaults(array_replace($matches, ['_route' => 'route16']), array( 'var1' => 'val',));
}
// route17
@ -329,20 +307,19 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
if (0 === strpos($pathinfo, '/a/b')) {
// b
if (preg_match('#^/a/b/(?P<var>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'b']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'b']), array());
}
// c
if (0 === strpos($pathinfo, '/a/b/c') && preg_match('#^/a/b/c/(?P<var>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'c']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'c']), array());
}
}
// secure
if ('/secure' === $pathinfo) {
$ret = ['_route' => 'secure'];
$requiredSchemes = array ( 'https' => 0,);
$requiredSchemes = array( 'https' => 0,);
if (!isset($requiredSchemes[$context->getScheme()])) {
if ('GET' !== $canonicalMethod) {
goto not_secure;
@ -358,7 +335,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
// nonsecure
if ('/nonsecure' === $pathinfo) {
$ret = ['_route' => 'nonsecure'];
$requiredSchemes = array ( 'http' => 0,);
$requiredSchemes = array( 'http' => 0,);
if (!isset($requiredSchemes[$context->getScheme()])) {
if ('GET' !== $canonicalMethod) {
goto not_nonsecure;

3
console/skel/symfony/routing/Tests/Fixtures/dumper/url_matcher3.php
View file

@ -36,9 +36,8 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
// dynamic
if (preg_match('#^/rootprefix/(?P<var>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'dynamic']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'dynamic']), array());
}
}
// with-condition

1
console/skel/symfony/routing/Tests/Fixtures/dumper/url_matcher4.php
View file

@ -100,7 +100,6 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
return $ret;
}
not_put_and_get_and_head:
}
if ('/' === $pathinfo && !$allow) {

12
console/skel/symfony/routing/Tests/Fixtures/dumper/url_matcher5.php
View file

@ -43,12 +43,11 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
if ('/a/333' === $pathinfo) {
return ['_route' => 'a_third'];
}
}
// a_wildcard
if (preg_match('#^/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'a_wildcard']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'a_wildcard']), array());
}
if (0 === strpos($pathinfo, '/a')) {
@ -96,12 +95,11 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
return $ret;
}
not_a_sixth:
}
// nested_wildcard
if (0 === strpos($pathinfo, '/nested') && preg_match('#^/nested/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'nested_wildcard']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'nested_wildcard']), array());
}
if (0 === strpos($pathinfo, '/nested/group')) {
@ -149,10 +147,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
return $ret;
}
not_nested_c:
}
elseif (0 === strpos($pathinfo, '/slashed/group')) {
} elseif (0 === strpos($pathinfo, '/slashed/group')) {
// slashed_a
if ('/slashed/group' === $trimmedPathinfo) {
$ret = ['_route' => 'slashed_a'];
@ -197,7 +192,6 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
return $ret;
}
not_slashed_c:
}
if ('/' === $pathinfo && !$allow) {

32
console/skel/symfony/routing/Tests/Fixtures/dumper/url_matcher6.php
View file

@ -69,18 +69,15 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
return $ret;
}
not_simple_trailing_slash_POST_method:
}
elseif (0 === strpos($pathinfo, '/trailing/regex')) {
} elseif (0 === strpos($pathinfo, '/trailing/regex')) {
// regex_trailing_slash_no_methods
if (0 === strpos($pathinfo, '/trailing/regex/no-methods') && preg_match('#^/trailing/regex/no\\-methods/(?P<param>[^/]++)/$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_no_methods']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_no_methods']), array());
}
// regex_trailing_slash_GET_method
if (0 === strpos($pathinfo, '/trailing/regex/get-method') && preg_match('#^/trailing/regex/get\\-method/(?P<param>[^/]++)/$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_GET_method']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_GET_method']), array());
if (!in_array($canonicalMethod, ['GET'])) {
$allow = array_merge($allow, ['GET']);
goto not_regex_trailing_slash_GET_method;
@ -92,7 +89,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
// regex_trailing_slash_HEAD_method
if (0 === strpos($pathinfo, '/trailing/regex/head-method') && preg_match('#^/trailing/regex/head\\-method/(?P<param>[^/]++)/$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_HEAD_method']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_HEAD_method']), array());
if (!in_array($requestMethod, ['HEAD'])) {
$allow = array_merge($allow, ['HEAD']);
goto not_regex_trailing_slash_HEAD_method;
@ -104,7 +101,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
// regex_trailing_slash_POST_method
if (0 === strpos($pathinfo, '/trailing/regex/post-method') && preg_match('#^/trailing/regex/post\\-method/(?P<param>[^/]++)/$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_POST_method']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_POST_method']), array());
if (!in_array($requestMethod, ['POST'])) {
$allow = array_merge($allow, ['POST']);
goto not_regex_trailing_slash_POST_method;
@ -113,10 +110,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
return $ret;
}
not_regex_trailing_slash_POST_method:
}
elseif (0 === strpos($pathinfo, '/not-trailing/simple')) {
} elseif (0 === strpos($pathinfo, '/not-trailing/simple')) {
// simple_not_trailing_slash_no_methods
if ('/not-trailing/simple/no-methods' === $pathinfo) {
return ['_route' => 'simple_not_trailing_slash_no_methods'];
@ -157,18 +151,15 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
return $ret;
}
not_simple_not_trailing_slash_POST_method:
}
elseif (0 === strpos($pathinfo, '/not-trailing/regex')) {
} elseif (0 === strpos($pathinfo, '/not-trailing/regex')) {
// regex_not_trailing_slash_no_methods
if (0 === strpos($pathinfo, '/not-trailing/regex/no-methods') && preg_match('#^/not\\-trailing/regex/no\\-methods/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_no_methods']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_no_methods']), array());
}
// regex_not_trailing_slash_GET_method
if (0 === strpos($pathinfo, '/not-trailing/regex/get-method') && preg_match('#^/not\\-trailing/regex/get\\-method/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_GET_method']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_GET_method']), array());
if (!in_array($canonicalMethod, ['GET'])) {
$allow = array_merge($allow, ['GET']);
goto not_regex_not_trailing_slash_GET_method;
@ -180,7 +171,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
// regex_not_trailing_slash_HEAD_method
if (0 === strpos($pathinfo, '/not-trailing/regex/head-method') && preg_match('#^/not\\-trailing/regex/head\\-method/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_HEAD_method']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_HEAD_method']), array());
if (!in_array($requestMethod, ['HEAD'])) {
$allow = array_merge($allow, ['HEAD']);
goto not_regex_not_trailing_slash_HEAD_method;
@ -192,7 +183,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
// regex_not_trailing_slash_POST_method
if (0 === strpos($pathinfo, '/not-trailing/regex/post-method') && preg_match('#^/not\\-trailing/regex/post\\-method/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_POST_method']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_POST_method']), array());
if (!in_array($requestMethod, ['POST'])) {
$allow = array_merge($allow, ['POST']);
goto not_regex_not_trailing_slash_POST_method;
@ -201,7 +192,6 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Matcher\UrlMatcher
return $ret;
}
not_regex_not_trailing_slash_POST_method:
}
if ('/' === $pathinfo && !$allow) {

32
console/skel/symfony/routing/Tests/Fixtures/dumper/url_matcher7.php
View file

@ -87,13 +87,10 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
return $ret;
}
not_simple_trailing_slash_POST_method:
}
elseif (0 === strpos($pathinfo, '/trailing/regex')) {
} elseif (0 === strpos($pathinfo, '/trailing/regex')) {
// regex_trailing_slash_no_methods
if (0 === strpos($pathinfo, '/trailing/regex/no-methods') && preg_match('#^/trailing/regex/no\\-methods/(?P<param>[^/]++)/?$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_no_methods']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_no_methods']), array());
if ('/' === substr($pathinfo, -1)) {
// no-op
} elseif ('GET' !== $canonicalMethod) {
@ -108,7 +105,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
// regex_trailing_slash_GET_method
if (0 === strpos($pathinfo, '/trailing/regex/get-method') && preg_match('#^/trailing/regex/get\\-method/(?P<param>[^/]++)/?$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_GET_method']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_GET_method']), array());
if ('/' === substr($pathinfo, -1)) {
// no-op
} elseif ('GET' !== $canonicalMethod) {
@ -128,7 +125,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
// regex_trailing_slash_HEAD_method
if (0 === strpos($pathinfo, '/trailing/regex/head-method') && preg_match('#^/trailing/regex/head\\-method/(?P<param>[^/]++)/$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_HEAD_method']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_HEAD_method']), array());
if (!in_array($requestMethod, ['HEAD'])) {
$allow = array_merge($allow, ['HEAD']);
goto not_regex_trailing_slash_HEAD_method;
@ -140,7 +137,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
// regex_trailing_slash_POST_method
if (0 === strpos($pathinfo, '/trailing/regex/post-method') && preg_match('#^/trailing/regex/post\\-method/(?P<param>[^/]++)/$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_POST_method']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_trailing_slash_POST_method']), array());
if (!in_array($requestMethod, ['POST'])) {
$allow = array_merge($allow, ['POST']);
goto not_regex_trailing_slash_POST_method;
@ -149,10 +146,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
return $ret;
}
not_regex_trailing_slash_POST_method:
}
elseif (0 === strpos($pathinfo, '/not-trailing/simple')) {
} elseif (0 === strpos($pathinfo, '/not-trailing/simple')) {
// simple_not_trailing_slash_no_methods
if ('/not-trailing/simple/no-methods' === $pathinfo) {
return ['_route' => 'simple_not_trailing_slash_no_methods'];
@ -193,18 +187,15 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
return $ret;
}
not_simple_not_trailing_slash_POST_method:
}
elseif (0 === strpos($pathinfo, '/not-trailing/regex')) {
} elseif (0 === strpos($pathinfo, '/not-trailing/regex')) {
// regex_not_trailing_slash_no_methods
if (0 === strpos($pathinfo, '/not-trailing/regex/no-methods') && preg_match('#^/not\\-trailing/regex/no\\-methods/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
return $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_no_methods']), array ());
return $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_no_methods']), array());
}
// regex_not_trailing_slash_GET_method
if (0 === strpos($pathinfo, '/not-trailing/regex/get-method') && preg_match('#^/not\\-trailing/regex/get\\-method/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_GET_method']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_GET_method']), array());
if (!in_array($canonicalMethod, ['GET'])) {
$allow = array_merge($allow, ['GET']);
goto not_regex_not_trailing_slash_GET_method;
@ -216,7 +207,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
// regex_not_trailing_slash_HEAD_method
if (0 === strpos($pathinfo, '/not-trailing/regex/head-method') && preg_match('#^/not\\-trailing/regex/head\\-method/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_HEAD_method']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_HEAD_method']), array());
if (!in_array($requestMethod, ['HEAD'])) {
$allow = array_merge($allow, ['HEAD']);
goto not_regex_not_trailing_slash_HEAD_method;
@ -228,7 +219,7 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
// regex_not_trailing_slash_POST_method
if (0 === strpos($pathinfo, '/not-trailing/regex/post-method') && preg_match('#^/not\\-trailing/regex/post\\-method/(?P<param>[^/]++)$#sD', $pathinfo, $matches)) {
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_POST_method']), array ());
$ret = $this->mergeDefaults(array_replace($matches, ['_route' => 'regex_not_trailing_slash_POST_method']), array());
if (!in_array($requestMethod, ['POST'])) {
$allow = array_merge($allow, ['POST']);
goto not_regex_not_trailing_slash_POST_method;
@ -237,7 +228,6 @@ class ProjectUrlMatcher extends Symfony\Component\Routing\Tests\Fixtures\Redirec
return $ret;
}
not_regex_not_trailing_slash_POST_method:
}
if ('/' === $pathinfo && !$allow) {

103
console/skel/symfony/routing/Tests/Generator/UrlGeneratorTest.php
View file

@ -520,17 +520,41 @@ class UrlGeneratorTest extends TestCase
{
$routes = $this->getRoutes('test', new Route('/{name}', [], [], [], '{locale}.example.com', ['http']));
$this->assertSame('//fr.example.com/app.php/Fabien', $this->getGenerator($routes)->generate('test',
['name' => 'Fabien', 'locale' => 'fr'], UrlGeneratorInterface::NETWORK_PATH), 'network path with different host'
$this->assertSame(
'//fr.example.com/app.php/Fabien',
$this->getGenerator($routes)->generate(
'test',
['name' => 'Fabien', 'locale' => 'fr'],
UrlGeneratorInterface::NETWORK_PATH
),
'network path with different host'
);
$this->assertSame('//fr.example.com/app.php/Fabien?query=string', $this->getGenerator($routes, ['host' => 'fr.example.com'])->generate('test',
['name' => 'Fabien', 'locale' => 'fr', 'query' => 'string'], UrlGeneratorInterface::NETWORK_PATH), 'network path although host same as context'
$this->assertSame(
'//fr.example.com/app.php/Fabien?query=string',
$this->getGenerator($routes, ['host' => 'fr.example.com'])->generate(
'test',
['name' => 'Fabien', 'locale' => 'fr', 'query' => 'string'],
UrlGeneratorInterface::NETWORK_PATH
),
'network path although host same as context'
);
$this->assertSame('http://fr.example.com/app.php/Fabien', $this->getGenerator($routes, ['scheme' => 'https'])->generate('test',
['name' => 'Fabien', 'locale' => 'fr'], UrlGeneratorInterface::NETWORK_PATH), 'absolute URL because scheme requirement does not match context'
$this->assertSame(
'http://fr.example.com/app.php/Fabien',
$this->getGenerator($routes, ['scheme' => 'https'])->generate(
'test',
['name' => 'Fabien', 'locale' => 'fr'],
UrlGeneratorInterface::NETWORK_PATH
),
'absolute URL because scheme requirement does not match context'
);
$this->assertSame('http://fr.example.com/app.php/Fabien', $this->getGenerator($routes)->generate('test',
['name' => 'Fabien', 'locale' => 'fr'], UrlGeneratorInterface::ABSOLUTE_URL), 'absolute URL with same scheme because it is requested'
$this->assertSame(
'http://fr.example.com/app.php/Fabien',
$this->getGenerator($routes)->generate(
'test',
['name' => 'Fabien', 'locale' => 'fr'],
UrlGeneratorInterface::ABSOLUTE_URL
),
'absolute URL with same scheme because it is requested'
);
}
@ -545,26 +569,61 @@ class UrlGeneratorTest extends TestCase
$generator = $this->getGenerator($routes, ['host' => 'example.com', 'pathInfo' => '/fabien/symfony-is-great/']);
$this->assertSame('comments', $generator->generate('comments',
['author' => 'fabien', 'article' => 'symfony-is-great'], UrlGeneratorInterface::RELATIVE_PATH)
$this->assertSame(
'comments',
$generator->generate(
'comments',
['author' => 'fabien', 'article' => 'symfony-is-great'],
UrlGeneratorInterface::RELATIVE_PATH
)
);
$this->assertSame('comments?page=2', $generator->generate('comments',
['author' => 'fabien', 'article' => 'symfony-is-great', 'page' => 2], UrlGeneratorInterface::RELATIVE_PATH)
$this->assertSame(
'comments?page=2',
$generator->generate(
'comments',
['author' => 'fabien', 'article' => 'symfony-is-great', 'page' => 2],
UrlGeneratorInterface::RELATIVE_PATH
)
);
$this->assertSame('../twig-is-great/', $generator->generate('article',
['author' => 'fabien', 'article' => 'twig-is-great'], UrlGeneratorInterface::RELATIVE_PATH)
$this->assertSame(
'../twig-is-great/',
$generator->generate(
'article',
['author' => 'fabien', 'article' => 'twig-is-great'],
UrlGeneratorInterface::RELATIVE_PATH
)
);
$this->assertSame('../../bernhard/forms-are-great/', $generator->generate('article',
['author' => 'bernhard', 'article' => 'forms-are-great'], UrlGeneratorInterface::RELATIVE_PATH)
$this->assertSame(
'../../bernhard/forms-are-great/',
$generator->generate(
'article',
['author' => 'bernhard', 'article' => 'forms-are-great'],
UrlGeneratorInterface::RELATIVE_PATH
)
);
$this->assertSame('//bernhard.example.com/app.php/forms-are-great', $generator->generate('host',
['author' => 'bernhard', 'article' => 'forms-are-great'], UrlGeneratorInterface::RELATIVE_PATH)
$this->assertSame(
'//bernhard.example.com/app.php/forms-are-great',
$generator->generate(
'host',
['author' => 'bernhard', 'article' => 'forms-are-great'],
UrlGeneratorInterface::RELATIVE_PATH
)
);
$this->assertSame('https://example.com/app.php/bernhard/blog', $generator->generate('scheme',
['author' => 'bernhard'], UrlGeneratorInterface::RELATIVE_PATH)
$this->assertSame(
'https://example.com/app.php/bernhard/blog',
$generator->generate(
'scheme',
['author' => 'bernhard'],
UrlGeneratorInterface::RELATIVE_PATH
)
);
$this->assertSame('../../about', $generator->generate('unrelated',
[], UrlGeneratorInterface::RELATIVE_PATH)
$this->assertSame(
'../../about',
$generator->generate(
'unrelated',
[],
UrlGeneratorInterface::RELATIVE_PATH
)
);
}

3
console/skel/symfony/routing/Tests/Loader/ClosureLoaderTest.php
View file

@ -22,7 +22,8 @@ class ClosureLoaderTest extends TestCase
{
$loader = new ClosureLoader();
$closure = function () {};
$closure = function () {
};
$this->assertTrue($loader->supports($closure), '->supports() returns true if the resource is loadable');
$this->assertFalse($loader->supports('foo.foo'), '->supports() returns true if the resource is loadable');

20
console/skel/symfony/routing/Tests/Loader/PhpFileLoaderTest.php
View file

@ -92,21 +92,31 @@ class PhpFileLoaderTest extends TestCase
$expectedCollection = new RouteCollection();
$expectedCollection->add('foo', (new Route('/foo'))
$expectedCollection->add(
'foo',
(new Route('/foo'))
->setOptions(['utf8' => true])
->setCondition('abc')
);
$expectedCollection->add('buz', (new Route('/zub'))
$expectedCollection->add(
'buz',
(new Route('/zub'))
->setDefaults(['_controller' => 'foo:act'])
);
$expectedCollection->add('c_bar', (new Route('/sub/pub/bar'))
$expectedCollection->add(
'c_bar',
(new Route('/sub/pub/bar'))
->setRequirements(['id' => '\d+'])
);
$expectedCollection->add('c_pub_buz', (new Route('/sub/pub/buz'))
$expectedCollection->add(
'c_pub_buz',
(new Route('/sub/pub/buz'))
->setHost('host')
->setRequirements(['id' => '\d+'])
);
$expectedCollection->add('ouf', (new Route('/ouf'))
$expectedCollection->add(
'ouf',
(new Route('/ouf'))
->setSchemes(['https'])
->setMethods(['GET'])
->setDefaults(['id' => 0])

41
console/skel/symfony/routing/Tests/RouteCollectionTest.php
View file

@ -98,8 +98,11 @@ class RouteCollectionTest extends TestCase
$collection->addCollection($collection1);
$collection->add('last', $last = new Route('/last'));
$this->assertSame(['bar' => $bar, 'foo' => $foo, 'grandchild' => $grandchild, 'last' => $last], $collection->all(),
'->addCollection() imports routes of another collection, overrides if necessary and adds them at the end');
$this->assertSame(
['bar' => $bar, 'foo' => $foo, 'grandchild' => $grandchild, 'last' => $last],
$collection->all(),
'->addCollection() imports routes of another collection, overrides if necessary and adds them at the end'
);
}
public function testAddCollectionWithResources()
@ -117,25 +120,38 @@ class RouteCollectionTest extends TestCase
$collection = new RouteCollection();
$collection->add('foo', new Route('/{placeholder}'));
$collection1 = new RouteCollection();
$collection1->add('bar', new Route('/{placeholder}',
['_controller' => 'fixed', 'placeholder' => 'default'], ['placeholder' => '.+'], ['option' => 'value'])
$collection1->add(
'bar',
new Route(
'/{placeholder}',
['_controller' => 'fixed', 'placeholder' => 'default'],
['placeholder' => '.+'],
['option' => 'value']
)
);
$collection->addCollection($collection1);
$collection->addDefaults(['placeholder' => 'new-default']);
$this->assertEquals(['placeholder' => 'new-default'], $collection->get('foo')->getDefaults(), '->addDefaults() adds defaults to all routes');
$this->assertEquals(['_controller' => 'fixed', 'placeholder' => 'new-default'], $collection->get('bar')->getDefaults(),
'->addDefaults() adds defaults to all routes and overwrites existing ones');
$this->assertEquals(
['_controller' => 'fixed', 'placeholder' => 'new-default'],
$collection->get('bar')->getDefaults(),
'->addDefaults() adds defaults to all routes and overwrites existing ones'
);
$collection->addRequirements(['placeholder' => '\d+']);
$this->assertEquals(['placeholder' => '\d+'], $collection->get('foo')->getRequirements(), '->addRequirements() adds requirements to all routes');
$this->assertEquals(['placeholder' => '\d+'], $collection->get('bar')->getRequirements(),
'->addRequirements() adds requirements to all routes and overwrites existing ones');
$this->assertEquals(
['placeholder' => '\d+'],
$collection->get('bar')->getRequirements(),
'->addRequirements() adds requirements to all routes and overwrites existing ones'
);
$collection->addOptions(['option' => 'new-value']);
$this->assertEquals(
['option' => 'new-value', 'compiler_class' => 'Symfony\\Component\\Routing\\RouteCompiler'],
$collection->get('bar')->getOptions(), '->addOptions() adds options to all routes and overwrites existing ones'
$collection->get('bar')->getOptions(),
'->addOptions() adds options to all routes and overwrites existing ones'
);
}
@ -180,8 +196,11 @@ class RouteCollectionTest extends TestCase
$collection->addResource($bar = new FileResource(__DIR__.'/Fixtures/bar.xml'));
$collection->addResource(new FileResource(__DIR__.'/Fixtures/foo.xml'));
$this->assertEquals([$foo, $bar], $collection->getResources(),
'->addResource() adds a resource and getResources() only returns unique ones by comparing the string representation');
$this->assertEquals(
[$foo, $bar],
$collection->getResources(),
'->addResource() adds a resource and getResources() only returns unique ones by comparing the string representation'
);
}
public function testUniqueRouteWithGivenName()

4
console/skel/symfony/routing/Tests/RouteTest.php
View file

@ -87,7 +87,9 @@ class RouteTest extends TestCase
$this->assertEquals('bar2', $route->getDefault('foo2'), '->getDefault() return the default value');
$this->assertNull($route->getDefault('not_defined'), '->getDefault() return null if default value is not set');
$route->setDefault('_controller', $closure = function () { return 'Hello'; });
$route->setDefault('_controller', $closure = function () {
return 'Hello';
});
$this->assertEquals($closure, $route->getDefault('_controller'), '->setDefault() sets a default value');
$route->setDefaults(['foo' => 'foo']);

36
console/skel/symfony/service-contracts/Test/ServiceLocatorTest.php
View file

@ -27,9 +27,15 @@ abstract class ServiceLocatorTest extends TestCase
public function testHas()
{
$locator = $this->getServiceLocator([
'foo' => function () { return 'bar'; },
'bar' => function () { return 'baz'; },
function () { return 'dummy'; },
'foo' => function () {
return 'bar';
},
'bar' => function () {
return 'baz';
},
function () {
return 'dummy';
},
]);
$this->assertTrue($locator->has('foo'));
@ -40,8 +46,12 @@ abstract class ServiceLocatorTest extends TestCase
public function testGet()
{
$locator = $this->getServiceLocator([
'foo' => function () { return 'bar'; },
'bar' => function () { return 'baz'; },
'foo' => function () {
return 'bar';
},
'bar' => function () {
return 'baz';
},
]);
$this->assertSame('bar', $locator->get('foo'));
@ -71,7 +81,9 @@ abstract class ServiceLocatorTest extends TestCase
$this->expectExceptionMessage('The service "foo" has a dependency on a non-existent service "bar". This locator only knows about the "foo" service.');
}
$locator = $this->getServiceLocator([
'foo' => function () use (&$locator) { return $locator->get('bar'); },
'foo' => function () use (&$locator) {
return $locator->get('bar');
},
]);
$locator->get('foo');
@ -82,9 +94,15 @@ abstract class ServiceLocatorTest extends TestCase
$this->expectException('Psr\Container\ContainerExceptionInterface');
$this->expectExceptionMessage('Circular reference detected for service "bar", path: "bar -> baz -> bar".');
$locator = $this->getServiceLocator([
'foo' => function () use (&$locator) { return $locator->get('bar'); },
'bar' => function () use (&$locator) { return $locator->get('baz'); },
'baz' => function () use (&$locator) { return $locator->get('bar'); },
'foo' => function () use (&$locator) {
return $locator->get('bar');
},
'bar' => function () use (&$locator) {
return $locator->get('baz');
},
'baz' => function () use (&$locator) {
return $locator->get('bar');
},
]);
$locator->get('foo');

Some files were not shown because too many files have changed in this diff Show more