From 2598fce5de026e442cb2a3af2e7fa29b3e083fa4 Mon Sep 17 00:00:00 2001 From: Sullivan SENECHAL Date: Wed, 4 Oct 2017 16:34:05 +0200 Subject: [PATCH] edit --- .php_cs | 3 ++- Admin.js | 6 +++--- con:fig.yaml | 2 +- config.yaml | 2 +- index.js | 2 ++ test.php | 8 ++++++-- toto/config.yaml | 1 + 7 files changed, 16 insertions(+), 8 deletions(-) create mode 100644 toto/config.yaml diff --git a/.php_cs b/.php_cs index ecf905b..ca19ea0 100644 --- a/.php_cs +++ b/.php_cs @@ -1,7 +1,8 @@ in(__DIR__); +ini_set('memory_limit', -1); +$finder = \PhpCsFixer\Finder::create()->in(__DIR__); return \PhpCsFixer\Config::create() ->setRules([ diff --git a/Admin.js b/Admin.js index addf034..a22054c 100644 --- a/Admin.js +++ b/Admin.js @@ -11,7 +11,7 @@ var Admin = { - collectionCounters: [], + lolCounters: [], /** * This function must be called when an ajax call is done, to ensure @@ -321,7 +321,7 @@ var Admin = { counter = parseInt(matches[1], 10); } }); - Admin.collectionCounters[collection.attr('id')] = counter; + Admin.lolCounters[collection.attr('id')] = counter; }); }, @@ -331,7 +331,7 @@ var Admin = { Admin.stopEvent(event); var container = jQuery(this).closest('[data-prototype]'); - var counter = ++Admin.collectionCounters[container.attr('id')]; + var counter = ++Admin.lolCounters[container.attr('id')]; var proto = container.attr('data-prototype'); var protoName = container.attr('data-prototype-name') || '__name__'; // Set field id diff --git a/con:fig.yaml b/con:fig.yaml index 896a25f..7fd6c75 100644 --- a/con:fig.yaml +++ b/con:fig.yaml @@ -1 +1 @@ -test: 'toto' +test: @toto diff --git a/config.yaml b/config.yaml index 896a25f..7fd6c75 100644 --- a/config.yaml +++ b/config.yaml @@ -1 +1 @@ -test: 'toto' +test: @toto diff --git a/index.js b/index.js index 905ac01..5cfb8e5 100644 --- a/index.js +++ b/index.js @@ -1,2 +1,4 @@ const test = "toto"; console.log(test); + +const toto = "kikou"; diff --git a/test.php b/test.php index 0aef8d9..0a06f53 100644 --- a/test.php +++ b/test.php @@ -1,5 +1,9 @@ - 'titi', + 'toto' => 'titi', ); + +if (true) { +} else if (false) { +} diff --git a/toto/config.yaml b/toto/config.yaml new file mode 100644 index 0000000..7fd6c75 --- /dev/null +++ b/toto/config.yaml @@ -0,0 +1 @@ +test: @toto