phalcon#15186 - Remove deprecated C code from optimizers

kuhler-Stratege · Mar 23, 2021 · f4d2bd3 · f4d2bd3
1 parent 80588df
commit f4d2bd3
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 37 deletions.
diff --git a/optimizers/PhalconCssminOptimizer.php b/optimizers/PhalconCssminOptimizer.php
@@ -70,7 +70,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         );
 
         $context->codePrinter->output(
-            'phalcon_cssmin(' . $symbolVariable->getName() . ', ' . $resolvedParams[0] . ' TSRMLS_CC);'
+            'phalcon_cssmin(' . $symbolVariable->getName() . ', ' . $resolvedParams[0] . ');'
         );
 
         return new CompiledExpression(

diff --git a/optimizers/PhalconFixPathOptimizer.php b/optimizers/PhalconFixPathOptimizer.php
@@ -57,17 +57,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $context->headersManager->add('kernel/array');
-
         $symbolVariable->setDynamicTypes('array');
 
-        $resolvedParams = $call->getReadOnlyResolvedParams(
-            $expression['parameters'],
-            $context,
-            $expression
-        );
-
-        //$context->codePrinter->output('zephir_fast_array_merge(' . $symbolVariable->getName() . ', &(' . $resolvedParams[0] . '), &(' . $resolvedParams[1] . ') TSRMLS_CC);');
-
         return new CompiledExpression(
             'variable',
             $symbolVariable->getRealName(),

diff --git a/optimizers/PhalconJsminOptimizer.php b/optimizers/PhalconJsminOptimizer.php
@@ -70,7 +70,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         );
 
         $context->codePrinter->output(
-            'phalcon_jsmin(' . $symbolVariable->getName() . ', ' . $resolvedParams[0] . ' TSRMLS_CC);'
+            'phalcon_jsmin(' . $symbolVariable->getName() . ', ' . $resolvedParams[0] . ');'
         );
 
         return new CompiledExpression(

diff --git a/optimizers/PhalconOrmDestroyCacheOptimizer.php b/optimizers/PhalconOrmDestroyCacheOptimizer.php
@@ -32,7 +32,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
     {
         $context->headersManager->add('phalcon/mvc/model/orm');
 
-        $context->codePrinter->output('phalcon_orm_destroy_cache(TSRMLS_C);');
+        $context->codePrinter->output('phalcon_orm_destroy_cache();');
 
         return new CompiledExpression(
             'null',

diff --git a/optimizers/PhalconOrmSinglequotesOptimizer.php b/optimizers/PhalconOrmSinglequotesOptimizer.php
@@ -70,9 +70,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         );
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-
         $context->codePrinter->output(
-            'phalcon_orm_singlequotes(' . $symbol . ', ' . $resolvedParams[0] . ' TSRMLS_CC);'
+            'phalcon_orm_singlequotes(' . $symbol . ', ' . $resolvedParams[0] . ');'
         );
 
         return new CompiledExpression(

diff --git a/optimizers/PhalconPossibleAutoloadFilepathOptimizer.php b/optimizers/PhalconPossibleAutoloadFilepathOptimizer.php
@@ -60,17 +60,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $context->headersManager->add('kernel/array');
-
         $symbolVariable->setDynamicTypes('array');
 
-        $resolvedParams = $call->getReadOnlyResolvedParams(
-            $expression['parameters'],
-            $context,
-            $expression
-        );
-
-        //$context->codePrinter->output('zephir_fast_array_merge(' . $symbolVariable->getName() . ', &(' . $resolvedParams[0] . '), &(' . $resolvedParams[1] . ') TSRMLS_CC);');
-
         return new CompiledExpression(
             'variable',
             $symbolVariable->getRealName(),

diff --git a/optimizers/PhalconPrepareVirtualPathOptimizer.php b/optimizers/PhalconPrepareVirtualPathOptimizer.php
@@ -57,17 +57,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         }
 
         $context->headersManager->add('kernel/array');
-
         $symbolVariable->setDynamicTypes('array');
 
-        $resolvedParams = $call->getReadOnlyResolvedParams(
-            $expression['parameters'],
-            $context,
-            $expression
-        );
-
-        //$context->codePrinter->output('zephir_fast_array_merge(' . $symbolVariable->getName() . ', &(' . $resolvedParams[0] . '), &(' . $resolvedParams[1] . ') TSRMLS_CC);');
-
         return new CompiledExpression(
             'variable',
             $symbolVariable->getRealName(),

diff --git a/optimizers/PhalconReplacePathsOptimizer.php b/optimizers/PhalconReplacePathsOptimizer.php
@@ -72,9 +72,8 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         );
 
         $symbol = $context->backend->getVariableCode($symbolVariable);
-
         $context->codePrinter->output(
-            'phalcon_replace_paths(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $resolvedParams[2] . ' TSRMLS_CC);'
+            'phalcon_replace_paths(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $resolvedParams[2] . ');'
         );
 
         return new CompiledExpression(

diff --git a/optimizers/PhannotParseAnnotationsOptimizer.php b/optimizers/PhannotParseAnnotationsOptimizer.php
@@ -83,7 +83,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
         $context->codePrinter->output(
-            'ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $resolvedParams[2] . ' TSRMLS_CC);'
+            'ZEPHIR_LAST_CALL_STATUS = phannot_parse_annotations(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ', ' . $resolvedParams[2] . ');'
         );
 
         $call->checkTempParameters($context);

diff --git a/optimizers/PhqlParsePhqlOptimizer.php b/optimizers/PhqlParsePhqlOptimizer.php
@@ -83,7 +83,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
         $context->codePrinter->output(
-            'ZEPHIR_LAST_CALL_STATUS = phql_parse_phql(' . $symbol . ', ' . $resolvedParams[0] . ' TSRMLS_CC);'
+            'ZEPHIR_LAST_CALL_STATUS = phql_parse_phql(' . $symbol . ', ' . $resolvedParams[0] . ');'
         );
 
         $call->checkTempParameters($context);

diff --git a/optimizers/PhvoltParseViewOptimizer.php b/optimizers/PhvoltParseViewOptimizer.php
@@ -80,7 +80,7 @@ public function optimize(array $expression, Call $call, CompilationContext $cont
         $symbol = $context->backend->getVariableCode($symbolVariable);
 
         $context->codePrinter->output(
-            'ZEPHIR_LAST_CALL_STATUS = phvolt_parse_view(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ' TSRMLS_CC);'
+            'ZEPHIR_LAST_CALL_STATUS = phvolt_parse_view(' . $symbol . ', ' . $resolvedParams[0] . ', ' . $resolvedParams[1] . ');'
         );
 
         $call->checkTempParameters($context);