Merge pull request #1585 from phalcon/development

0.10.1

Library/Call.php

@@ -19,6 +19,7 @@
 
 namespace Zephir;
 
+use Zephir\Compiler\CompilerException;
 use Zephir\Detectors\ReadDetector;
 
 /**

Library/ClassConstant.php

@@ -19,6 +19,7 @@
 
 namespace Zephir;
 
+use Zephir\Compiler\CompilerException;
 use Zephir\Expression\Constants;
 
 /**

Library/ClassDefinition.php

@@ -21,6 +21,7 @@
 
 use Zephir\Documentation\Docblock;
 use Zephir\Documentation\DocblockParser;
+use Zephir\Compiler\CompilerException;
 
 /**
  * ClassDefinition

Library/ClassMethod.php

@@ -19,6 +19,7 @@
 
 namespace Zephir;
 
+use Zephir\Compiler\CompilerException;
 use Zephir\Passes\LocalContextPass;
 use Zephir\Passes\StaticTypeInference;
 use Zephir\Passes\CallGathererPass;
@@ -370,7 +371,7 @@ public function setIsInitializer($initializer)
     /**
      * Returns the class definition where the method was declared
      *
-     * @return ClassDefinition
+     * @return ClassDefinition|null
      */
     public function getClassDefinition()
     {

Library/ClassMethodParameters.php

@@ -19,6 +19,8 @@
 
 namespace Zephir;
 
+use Zephir\Compiler\CompilerException;
+
 /**
  * ClassMethodParameters
  *

Library/ClassProperty.php

@@ -19,6 +19,7 @@
 
 namespace Zephir;
 
+use Zephir\Compiler\CompilerException;
 use Zephir\Expression\Builder\Statements\LetStatement as ExpressionLetStatement;
 use Zephir\Expression\Builder\BuilderFactory;
 use Zephir\Expression\Builder\Operators\BinaryOperator;

Library/Commands/CommandHelp.php

@@ -26,15 +26,6 @@
  */
 class CommandHelp extends CommandAbstract
 {
-    const LOGO = '
- _____              __    _
-/__  /  ___  ____  / /_  (_)____
-  / /  / _ \/ __ \/ __ \/ / ___/
- / /__/  __/ /_/ / / / / / /
-/____/\___/ .___/_/ /_/_/_/
-         /_/
-';
-
     /**
      * {@inheritdoc}
      *

Library/Compiler.php

@@ -31,7 +31,7 @@
  */
 class Compiler
 {
-    const VERSION = '0.10.0';
+    const VERSION = '0.10.1';
 
     public $parserCompiled = false;
 
@@ -1151,7 +1151,7 @@ public function stubs(CommandInterface $command, $fromGenerate = false)
      * @param CommandInterface $command
      * @param boolean $development
      *
-     * @throws Exception
+     * @throws CompilerException
      */
     public function install(CommandInterface $command, $development = false)
     {
@@ -2014,14 +2014,13 @@ public function generateFunctionInformation()
         /**
          * Create argument info
          */
-
         foreach ($this->functionDefinitions as $func) {
             $funcName = $func->getInternalName();
             $argInfoName = 'arginfo_' . strtolower($funcName);
 
             $headerPrinter->output('PHP_FUNCTION(' . $funcName . ');');
             $parameters = $func->getParameters();
-            if (count($parameters)) {
+            if (count($parameters->getParameters())) {
                 $headerPrinter->output(
                     'ZEND_BEGIN_ARG_INFO_EX(' . $argInfoName . ', 0, 0, ' .
                     $func->getNumberOfRequiredParameters() . ')'
@@ -2040,7 +2039,9 @@ public function generateFunctionInformation()
                             if (isset($parameter['cast'])) {
                                 switch ($parameter['cast']['type']) {
                                     case 'variable':
+                                        $compilationContext = $func->getCallGathererPass()->getCompilationContext();
                                         $value = $parameter['cast']['value'];
+
                                         $headerPrinter->output(
                                             "\t" . 'ZEND_ARG_OBJ_INFO(0, ' .
                                             $parameter['name'] . ', ' .

Library/CompilerFile.php

@@ -15,6 +15,7 @@
 
 use Zephir\Parser\ParseException;
 use Zephir\Compiler\FileInterface;
+use Zephir\Compiler\CompilerException;
 use Zephir\Documentation\DocblockParser;
 use Zephir\Exception\IllegalStateException;
 
@@ -592,7 +593,7 @@ public function preCompile(Compiler $compiler)
         /**
          * Compilation context stores common objects required by compilation entities
          */
-        $compilationContext = new CompilationContext;
+        $compilationContext = new CompilationContext();
 
         /**
          * Set global compiler in the compilation context
@@ -832,7 +833,7 @@ public function compile(Compiler $compiler, StringsManager $stringsManager)
         /**
          * Compilation context stores common objects required by compilation entities
          */
-        $compilationContext = new CompilationContext;
+        $compilationContext = new CompilationContext();
 
         /**
          * Set global compiler in the compilation context

Library/CompilerFileAnonymous.php

@@ -162,7 +162,7 @@ public function compile(Compiler $compiler, StringsManager $stringsManager)
         /**
          * Compilation context stores common objects required by compilation entities
          */
-        $compilationContext = new CompilationContext;
+        $compilationContext = new CompilationContext();
 
         /**
          * Set global compiler in the compilation context

Library/Expression.php

@@ -19,6 +19,7 @@
 
 namespace Zephir;
 
+use Zephir\Compiler\CompilerException;
 use Zephir\Operators\Arithmetical\AddOperator;
 use Zephir\Operators\Arithmetical\SubOperator;
 use Zephir\Operators\Arithmetical\MulOperator;

Library/Expression/PropertyAccess.php

@@ -81,7 +81,7 @@ public function setNoisy($noisy)
      *
      * @param array $expression
      * @param CompilationContext $compilationContext
-     * @return \CompiledExpression
+     * @return CompiledExpression
      */
     public function compile($expression, CompilationContext $compilationContext)
     {

Library/Expression/PropertyDynamicAccess.php

@@ -83,7 +83,7 @@ public function setNoisy($noisy)
      *
      * @param array $expression
      * @param CompilationContext $compilationContext
-     * @return \CompiledExpression
+     * @return CompiledExpression
      */
     public function compile($expression, CompilationContext $compilationContext)
     {

Library/Expression/Reference.php

@@ -20,6 +20,7 @@
 namespace Zephir\Expression;
 
 use Zephir\Exception;
+use Zephir\GlobalConstant;
 use Zephir\Variable;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;

Library/Expression/StaticPropertyAccess.php

@@ -19,6 +19,7 @@
 
 namespace Zephir\Expression;
 
+use Zephir\ClassProperty;
 use Zephir\Variable;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;

Library/FileSystem/Redis.php

@@ -55,7 +55,7 @@ public function isInitialized()
      */
     public function initialize()
     {
-        $this->redis = new \Redis;
+        $this->redis = new \Redis();
         $this->redis->connect('127.0.0.1', 6379);
         $this->initialized = true;
     }

Library/FunctionCall.php

@@ -19,6 +19,7 @@
 
 namespace Zephir;
 
+use Zephir\Compiler\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
 /**

Library/Logger.php

@@ -13,6 +13,8 @@
 
 namespace Zephir;
 
+use Zephir\Compiler\CompilerException;
+
 /**
  * Logger
  *

Library/MethodCall.php

@@ -19,6 +19,7 @@
 
 namespace Zephir;
 
+use Zephir\Compiler\CompilerException;
 use Zephir\Detectors\ReadDetector;
 
 /**

Library/Operators/Unary/MinusOperator.php

@@ -34,12 +34,11 @@ class MinusOperator extends BaseOperator
      * @param CompilationContext $compilationContext
      * @return CompiledExpression
      * @throws CompilerException
-     * @throws Exception
      */
     public function compile($expression, CompilationContext $compilationContext)
     {
         if (!isset($expression['left'])) {
-            throw new \Exception("Missing left part of the expression");
+            throw new CompilerException("Missing left part of the expression");
         }
 
         $leftExpr = new Expression($expression['left']);

Library/Optimizers/FunctionCall/GetDefinedVarsOptimizer.php

@@ -22,6 +22,7 @@
 use Zephir\Call;
 use Zephir\CompilationContext;
 use Zephir\CompiledExpression;
+use Zephir\Compiler\CompilerException;
 use Zephir\Optimizers\OptimizerAbstract;
 
 /**

Library/Passes/CallGathererPass.php

@@ -2,42 +2,38 @@
 
 /*
  +--------------------------------------------------------------------------+
- | Zephir Language                                                          |
- +--------------------------------------------------------------------------+
- | Copyright (c) 2013-2017 Zephir Team and contributors                     |
- +--------------------------------------------------------------------------+
- | This source file is subject the MIT license, that is bundled with        |
- | this package in the file LICENSE, and is available through the           |
- | world-wide-web at the following url:                                     |
- | http://zephir-lang.com/license.html                                      |
+ | Zephir                                                                   |
+ | Copyright (c) 2013-present Zephir (https://zephir-lang.com/)             |
  |                                                                          |
- | If you did not receive a copy of the MIT license and are unable          |
- | to obtain it through the world-wide-web, please send a note to           |
- | license@zephir-lang.com so we can mail you a copy immediately.           |
+ | This source file is subject the MIT license, that is bundled with this   |
+ | package in the file LICENSE, and is available through the world-wide-web |
+ | at the following url: http://zephir-lang.com/license.html                |
  +--------------------------------------------------------------------------+
-*/
+ */
 
 namespace Zephir\Passes;
 
-use Zephir\StatementsBlock;
 use Zephir\FunctionCall;
+use Zephir\StatementsBlock;
 use Zephir\CompilationContext;
 
 /**
- * CallGathererPass
+ * Zephir\Passes\CallGathererPass
  *
  * This pass counts how many times the same function is called inside a
  * statements block. It also count how many times a method is calling
  * trying to track the possible caller.
  *
  * This pass is used by the function/method caches to explore possible
  * optimizations by implementing inline caches.
+ *
+ * @package Zephir\Passes
  */
 class CallGathererPass
 {
-    protected $functionCalls = array();
+    protected $functionCalls = [];
 
-    protected $methodCalls = array();
+    protected $methodCalls = [];
 
     protected $compilationContext;
 
@@ -51,6 +47,16 @@ public function __construct(CompilationContext $compilationContext)
         $this->compilationContext = $compilationContext;
     }
 
+    /**
+     * Gets current CompilationContext.
+     *
+     * @return CompilationContext
+     */
+    public function getCompilationContext()
+    {
+        return $this->compilationContext;
+    }
+
     /**
      * Returns the number of calls a function had
      *
@@ -83,7 +89,7 @@ public function getNumberOfMethodCalls($className, $methodName)
     /**
      * Returns all the method calls
      *
-     * @return int
+     * @return array
      */
     public function getAllMethodCalls()
     {

Library/Statements/ForStatement.php

@@ -41,7 +41,7 @@ class ForStatement extends StatementAbstract
      * Compiles a for statement that use a 'range' as expression
      *
      * @param array $exprRaw
-     * @param \CompilationContext $compilationContext
+     * @param CompilationContext $compilationContext
      * @return boolean
      */
     public function compileRange($exprRaw, CompilationContext $compilationContext)
@@ -403,7 +403,7 @@ public function compileRange($exprRaw, CompilationContext $compilationContext)
      * Compiles a 'for' statement that use an 'iterator' as expression
      *
      * @param array $exprRaw
-     * @param \CompilationContext $compilationContext
+     * @param CompilationContext $compilationContext
      * @return boolean
      */
     public function compileIterator(array $exprRaw, CompilationContext $compilationContext)

Library/Statements/Let/StaticProperty.php

@@ -19,6 +19,7 @@
 
 namespace Zephir\Statements\Let;
 
+use Zephir\ClassProperty;
 use Zephir\CompilationContext;
 use Zephir\Compiler\CompilerException;
 use Zephir\Expression;

Library/Statements/Let/StaticPropertyAppend.php

@@ -19,6 +19,7 @@
 
 namespace Zephir\Statements\Let;
 
+use Zephir\ClassProperty;
 use Zephir\CompilationContext;
 use Zephir\Compiler\CompilerException;
 use Zephir\CompiledExpression;

Library/Statements/Let/StaticPropertyArrayIndex.php

@@ -19,6 +19,7 @@
 
 namespace Zephir\Statements\Let;
 
+use Zephir\ClassProperty;
 use Zephir\CompilationContext;
 use Zephir\Compiler\CompilerException;
 use Zephir\Expression;

Library/Statements/Let/StaticPropertyArrayIndexAppend.php

@@ -19,6 +19,7 @@
 
 namespace Zephir\Statements\Let;
 
+use Zephir\ClassProperty;
 use Zephir\CompilationContext;
 use Zephir\Compiler\CompilerException;
 use Zephir\Expression;

Library/StaticCall.php

@@ -19,6 +19,7 @@
 
 namespace Zephir;
 
+use Zephir\Compiler\CompilerException;
 use Zephir\Detectors\ReadDetector;
 
 /**

Library/SymbolTable.php

@@ -19,6 +19,7 @@
 
 namespace Zephir;
 
+use Zephir\Compiler\CompilerException;
 use Zephir\Variable\Globals;
 use Zephir\Passes\LocalContextPass;