renamed environment & staticEnvironment to variable & staticVariables

cappuc · cappuc · commit 1a08b085329a · 2024-12-24T11:41:22.000+01:00
diff --git a/performance/CompiledThemeTestTemplate.php b/performance/CompiledThemeTestTemplate.php
@@ -51,7 +51,7 @@ public function stream(array $assigns = []): void
     protected function buildContext(array $assigns = []): RenderContext
     {
         return $this->environment->newRenderContext(
-            staticEnvironment: $assigns,
+            staticVariables: $assigns,
         );
     }
 }
diff --git a/src/Environment.php b/src/Environment.php
@@ -63,13 +63,13 @@ public function newRenderContext(
          *
          * @var array<string, mixed> $environment
          */
-        array $environment = [],
+        array $variables = [],
         /**
          * Environment variables that are shared with all sub-contexts
          *
          * @var array<string, mixed> $staticEnvironment
          */
-        array $staticEnvironment = [],
+        array $staticVariables = [],
         /**
          * Registers allows to provide/export data or utilities inside tags
          * Registers are not accessible as variables.
@@ -82,8 +82,8 @@ public function newRenderContext(
         ?ResourceLimits $resourceLimits = null,
     ): RenderContext {
         return new RenderContext(
-            variables: $environment,
-            staticVariables: $staticEnvironment,
+            variables: $variables,
+            staticVariables: $staticVariables,
             registers: $registers,
             profile: $this->profile,
             options: $options ?? $this->defaultRenderContextOptions,
diff --git a/tests/Integration/ErrorHandlingTest.php b/tests/Integration/ErrorHandlingTest.php
@@ -179,7 +179,7 @@
     $template = $environment->parseString("Argument error:\n{% render 'product' with errors %}");
 
     $output = $template->render($environment->newRenderContext(
-        staticEnvironment: ['errors' => new ErrorDrop],
+        staticVariables: ['errors' => new ErrorDrop],
     ));
 
     expect($output)
diff --git a/tests/Integration/OutputTest.php b/tests/Integration/OutputTest.php
@@ -36,7 +36,7 @@
         ->registerFilters(FunnyFilter::class)
         ->build();
     $context = $environment->newRenderContext(
-        staticEnvironment: $this->assigns,
+        staticVariables: $this->assigns,
     );
 
     expect($environment->parseString(' {{ car.gm | make_funny }} ')->render($context))
@@ -48,7 +48,7 @@
         ->registerFilters(FunnyFilter::class)
         ->build();
     $context = $environment->newRenderContext(
-        staticEnvironment: $this->assigns,
+        staticVariables: $this->assigns,
     );
 
     expect($environment->parseString(' {{ car.gm | cite_funny }} ')->render($context))
@@ -60,7 +60,7 @@
         ->registerFilters(FunnyFilter::class)
         ->build();
     $context = $environment->newRenderContext(
-        staticEnvironment: $this->assigns,
+        staticVariables: $this->assigns,
     );
 
     expect($environment->parseString(" {{ car.gm | add_smiley : ':-(' }} ")->render($context))
@@ -72,7 +72,7 @@
         ->registerFilters(FunnyFilter::class)
         ->build();
     $context = $environment->newRenderContext(
-        staticEnvironment: $this->assigns,
+        staticVariables: $this->assigns,
     );
 
     expect($environment->parseString(' {{ car.gm | add_smiley }} ')->render($context))
@@ -84,7 +84,7 @@
         ->registerFilters(FunnyFilter::class)
         ->build();
     $context = $environment->newRenderContext(
-        staticEnvironment: $this->assigns,
+        staticVariables: $this->assigns,
     );
 
     expect($environment->parseString(" {{ car.gm | add_smiley : ':-(' | add_smiley : ':-('}} ")->render($context))
@@ -96,7 +96,7 @@
         ->registerFilters(FunnyFilter::class)
         ->build();
     $context = $environment->newRenderContext(
-        staticEnvironment: $this->assigns,
+        staticVariables: $this->assigns,
     );
 
     expect($environment->parseString(" {{ car.gm | add_tag : 'span', 'bar'}} ")->render($context))
@@ -108,7 +108,7 @@
         ->registerFilters(FunnyFilter::class)
         ->build();
     $context = $environment->newRenderContext(
-        staticEnvironment: $this->assigns,
+        staticVariables: $this->assigns,
     );
 
     expect($environment->parseString(" {{ car.gm | add_tag : 'span', car.bmw}} ")->render($context))
@@ -120,7 +120,7 @@
         ->registerFilters(FunnyFilter::class)
         ->build();
     $context = $environment->newRenderContext(
-        staticEnvironment: ['best_cars' => 'bmw']
+        staticVariables: ['best_cars' => 'bmw']
     );
 
     expect($environment->parseString(' {{ best_cars | cite_funny | paragraph }} ')->render($context))
@@ -133,7 +133,7 @@
         ->build();
 
     $context = $environment->newRenderContext(
-        staticEnvironment: $this->assigns,
+        staticVariables: $this->assigns,
     );
 
     expect($environment->parseString(" {{ 'Typo' | link_to: 'http://typo.leetsoft.com' }} ")->render($context))
diff --git a/tests/Integration/ProfilerTest.php b/tests/Integration/ProfilerTest.php
@@ -196,7 +196,7 @@ function profileTemplate(string $source, array $assigns = []): ?Profiler
     $environment = $factory->setProfile()->build();
     $template = $environment->parseString($source);
     $template->render($environment->newRenderContext(
-        staticEnvironment: $assigns,
+        staticVariables: $assigns,
     ));
 
     return $template->getProfiler();
diff --git a/tests/Integration/TemplateTest.php b/tests/Integration/TemplateTest.php
@@ -136,7 +136,7 @@
 
     $template = parseTemplate('{{x}} {{y}} {{z.a}} {{z.b}} {{z.c.d}}');
     $context = $environment->newRenderContext(
-        staticEnvironment: [
+        staticVariables: [
             'x' => 33,
             'z' => ['a' => 32, 'c' => ['e' => 31]],
         ],
@@ -190,7 +190,7 @@
 
     $template = parseTemplate('{{ d.text }} {{ d.undefined }}');
     $context = $environment->newRenderContext(
-        staticEnvironment: [
+        staticVariables: [
             'd' => new \Keepsuit\Liquid\Tests\Stubs\TextDrop,
         ],
     );
@@ -217,7 +217,7 @@
 
     $template = parseTemplate('{{ d.text }} {{ d.undefined }}');
     $context = $environment->newRenderContext(
-        staticEnvironment: [
+        staticVariables: [
             'd' => new \Keepsuit\Liquid\Tests\Stubs\TextDrop,
         ],
     );
@@ -240,7 +240,7 @@
 
     $template = parseTemplate('{{a}} {{x | upcase | somefilter1 | somefilter2 | capitalize}}', $environment);
     $context = $environment->newRenderContext(
-        staticEnvironment: [
+        staticVariables: [
             'a' => 123,
             'x' => 'foo',
         ],
@@ -270,7 +270,7 @@
 
     $template = parseTemplate('{{a}} {{x | upcase | somefilter1 | somefilter2 | capitalize}}');
     $context = $environment->newRenderContext(
-        staticEnvironment: [
+        staticVariables: [
             'a' => 123,
             'x' => 'foo',
         ],
diff --git a/tests/Pest.php b/tests/Pest.php
@@ -30,7 +30,7 @@ function buildRenderContext(
     ?Environment $environment = null
 ) {
     $context = ($environment ?? Environment::default())->newRenderContext(
-        staticEnvironment: $assigns,
+        staticVariables: $assigns,
     );
 
     foreach ($registers as $key => $value) {

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public function stream(array $assigns = []): void`
`51`	`51`	`protected function buildContext(array $assigns = []): RenderContext`
`52`	`52`	`{`
`53`	`53`	`return $this->environment->newRenderContext(`
`54`		`- staticEnvironment: $assigns,`
	`54`	`+ staticVariables: $assigns,`
`55`	`55`	`);`
`56`	`56`	`}`
`57`	`57`	`}`