Commit 6feae0db authored by Laurent Lecluse's avatar Laurent Lecluse
Browse files

wip

parent 366e9ba6

code/test2.php

+36 −0
Changes for code/test2.php: 36 added lines, 0 removed lines.
Original line number Diff line number Diff line
@@ -9,3 +9,39 @@ use Unicaen\OpenDocument\Calc; 
 * @var $viewName   string

 * @var $viewFile   string

 */

?>

<script>















    const a = {

        languages: ["Spanish", "Portuguese"],

        name: "Todd",

        adresse: {

            rue: '1 rue George Sand',

            cp: 14400,

            ville: 'Saint Martin des Entrées'

        },

        age: 20

    };



    const b = {

        languages: ["Français", "Portuguese"],

        married: true,

        adresse: {

            cp: 14400,

            ville: 'Bayeux',

            pays: 'France'

        },

    };





    const c = mergeDeep(a, b);



    console.log(c)



</script>

composer.json

+1 −1
Changes for composer.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
    ],

    "require"          : {

        "php"                                         : ">=8.0",

        "unicaen/app"                                 : "6.0.1",

        "unicaen/app"                                 : "6.0.5",

        "unicaen/authentification"                    : "6.0.3",

        "unicaen/privilege"                           : "6.0.1",

        "unicaen/utilisateur"                         : "6.0.4",

composer.lock

+6 −6
Changes for composer.lock: 6 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",

        "This file is @generated automatically"

    ],

    "content-hash": "cec8274d1ee5d44a74b37a378698d10c",

    "content-hash": "8869b54c5fc7e238333cfa66c9f7d051",

    "packages": [

        {

            "name": "beberlei/assert",
@@ -6878,11 +6878,11 @@ 
        },

        {

            "name": "unicaen/app",

            "version": "6.0.1",

            "version": "6.0.5",

            "source": {

                "type": "git",

                "url": "https://git.unicaen.fr/lib/unicaen/app.git",

                "reference": "19335523fd529823d959a3c6cc9eccf3b0dc63b8"

                "reference": "a85de98e91ea41bf97eb0fdb9359f4942e9fe96d"

            },

            "require": {

                "beberlei/assert": "^3.3",
@@ -6917,7 +6917,7 @@ 
                "mpdf/mpdf": "^8.0",

                "ocramius/proxy-manager": "^2.0",

                "php": "^8.0",

                "unicaen/console": "dev-main"

                "unicaen/console": "^6.0"

            },

            "require-dev": {

                "laminas/laminas-test": "^3.2",
@@ -6938,7 +6938,7 @@ 
                ]

            },

            "description": "Module de base des applications unicaen",

            "time": "2023-02-08T15:57:37+00:00"

            "time": "2023-03-21T14:44:06+00:00"

        },

        {

            "name": "unicaen/authentification",
@@ -7061,7 +7061,7 @@ 
        },

        {

            "name": "unicaen/console",

            "version": "dev-main",

            "version": "6.0.0",

            "source": {

                "type": "git",

                "url": "https://git.unicaen.fr/lib/unicaen/console.git",

config/application.config.php

+1 −0
Changes for config/application.config.php: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -131,6 +131,7 @@ class AppConfig 
            'UnicaenImport',

            'UnicaenTbl',

            'UnicaenSiham',

            'UnicaenVue',

            'Application',

            'Agrement',

            'Intervenant',

module/Application/config/aaa_module.config.php

+0 −3
Changes for module/Application/config/aaa_module.config.php: 0 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -215,8 +215,6 @@ $config = [ 
//            \UnicaenApp\View\Helper\AppLink::class                             => View\Helper\AppLinkFactory::class,

//            \UnicaenUtilisateur\View\Helper\UserCurrent::class                 => View\Helper\UserCurrentFactory::class,

            'tab'                                                              => View\Helper\TabViewHelperFactory::class,

            'vite'                                                             => View\Helper\ViteViewHelperFactory::class,

            'vue'                                                              => View\Helper\VueViewHelperFactory::class,

        ],

        'invokables' => [

            'utilisateur'     => View\Helper\UtilisateurViewHelper::class,
@@ -234,7 +232,6 @@ $config = [ 
    'controller_plugins' => [

        'factories' => [

            'context' => Controller\Plugin\ContextFactory::class,

            'axios'   => Controller\Plugin\AxiosFactory::class,

        ],

    ],

    'view_manager'       => [