Skip to content

Commit 3f80724

Browse files
author
Oleksii Korshenko
committed
bug fixes
1 parent 39d4d28 commit 3f80724

13 files changed

+430
-423
lines changed

‎code/ClassReader.php‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,15 @@ public function read($filePath, $autoloaderPath, $basePath)
2727
{
2828
/** @var ClassLoader $classLoader */
2929
$classLoader = require $autoloaderPath;
30-
$classLoader->register();
30+
$classLoader->register(true);
3131
$classes = AnnotationsParser::parsePhp(file_get_contents($filePath));
3232
$reflector = new ClassReflector(new ComposerSourceLocator($classLoader));
3333
$output = [];
3434

3535
foreach ($classes as $className => $someData) {
3636
$reflectionClass = $reflector->reflect($className);
37-
$classDocBlock = new DocBlock($reflectionClass->getAst()->getDocComment()->getText());
37+
$docCommentObject = $reflectionClass->getAst()->getDocComment();
38+
$classDocBlock = new DocBlock($docCommentObject ? $docCommentObject->getText() : '');
3839
$classDeprecated = $classDocBlock->getTagsByName('deprecated');
3940
$classSee = $classDocBlock->getTagsByName('see');
4041
$classSince = $classDocBlock->getTagsByName('since');
@@ -100,12 +101,13 @@ private function readMethods(ReflectionClass $reflectionClass)
100101
foreach ($reflectionClass->getImmediateMethods() as $method) {
101102
$deprecated = $see = $since =[];
102103
try {
103-
$docBlock = new DocBlock($method->getAst()->getDocComment()->getText());
104+
$docCommentObject = $method->getAst()->getDocComment();
105+
$docBlock = new DocBlock($docCommentObject ? $docCommentObject->getText() : '');
104106
$deprecated = $docBlock->getTagsByName('deprecated');
105107
$see = $docBlock->getTagsByName('see');
106108
$since = $docBlock->getTagsByName('since');
107109
} catch (\Exception $exception) {
108-
echo 'Invalid DocBlock in ' . $reflectionClass->getName() . '::' . $method->getName() . ' ' . $reflectionClass->getLocatedSource()->getFileName() . PHP_EOL;
110+
echo 'Invalid DocBlock in ' . $reflectionClass->getName() . '::' . $method->getName() . ' ' . realpath($reflectionClass->getLocatedSource()->getFileName()) . ' :: ' . $exception->getMessage() . PHP_EOL;
109111
}
110112

111113
$methodMeta = new MethodMetadata();
@@ -140,7 +142,7 @@ private function readProperties(ReflectionClass $reflectionClass)
140142
$see = $docBlock->getTagsByName('see');
141143
$since = $docBlock->getTagsByName('since');
142144
} catch (\Exception $exception) {
143-
echo 'Invalid DocBlock in ' . $reflectionClass->getName() . '::' . $property->getName() . ' ' . $reflectionClass->getLocatedSource()->getFileName() . PHP_EOL;
145+
echo 'Invalid DocBlock in ' . $reflectionClass->getName() . '::' . $property->getName() . ' ' . realpath($reflectionClass->getLocatedSource()->getFileName()) . ' :: ' . $exception->getMessage() . PHP_EOL;
144146
}
145147

146148
$propertyMetadata = new PropertyMetadata();

‎code/CodeUpdater/AbstractUpdater.php‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,22 @@ public final function run()
4848

4949
$this->classLoader->register();
5050

51-
$logger = new \Zend\Log\Logger();
52-
$infoWriter = new \Zend\Log\Writer\Stream('php://output');
53-
$infoWriter->setFormatter('simple', ['format' => '%timestamp% ' . $this->getLogType() . ' %priorityName%: %message%', 'dateTimeFormat' => 'H:i:s']);
51+
$logger = new \Zend_Log();
52+
$infoWriter = new \Zend_Log_Writer_Stream('php://output');
53+
$infoWriter->setFormatter(new \Zend_Log_Formatter_Simple('%timestamp% ' . $this->getLogType() . ' %priorityName%: %message%'));
5454

55-
$errorWriter = new \Zend\Log\Writer\Stream($this->config->getLogPath($this->edition . '/' . $this->getLogType() . '.error.log'));
56-
$errorWriter->addFilter(\Zend\Log\Logger::ERR);
57-
$errorWriter->setFormatter('simple', ['format' => '%timestamp% %priorityName%: %message%', 'dateTimeFormat' => 'H:i:s']);
55+
$errorWriter = new \Zend_Log_Writer_Stream($this->config->getLogPath($this->edition . '/' . $this->getLogType() . '.error.log'));
56+
$errorWriter->addFilter(\Zend_Log::ERR);
57+
$errorWriter->setFormatter(new \Zend_Log_Formatter_Simple('%timestamp% %priorityName%: %message%'));
5858

59-
$logger->addWriter($infoWriter, \Zend\Log\Logger::INFO);
60-
$logger->addWriter($errorWriter, \Zend\Log\Logger::ERR);
59+
$logger->addWriter($infoWriter);
60+
$logger->addWriter($errorWriter);
6161
$this->execute($logger);
6262

6363
$this->classLoader->unregister();
6464
}
6565

66-
protected abstract function execute(\Zend\Log\Logger $logger);
66+
protected abstract function execute(\Zend_Log $logger);
6767

6868
protected abstract function getLogType();
6969

‎code/CodeUpdater/DeprecatedClasses.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ protected function getLogType()
1818
}
1919

2020
/**
21-
* @param \Zend\Log\Logger $logger
21+
* @param \Zend_Log $logger
2222
*/
23-
protected function execute(\Zend\Log\Logger $logger)
23+
protected function execute(\Zend_Log $logger)
2424
{
2525
$reflector = $this->getClassReflector();
2626
$changeLog = $this->getChangeLog();

‎code/CodeUpdater/DeprecatedMethods.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ protected function getLogType()
1818
}
1919

2020
/**
21-
* @param \Zend\Log\Logger $logger
21+
* @param \Zend_Log $logger
2222
*/
23-
protected function execute(\Zend\Log\Logger $logger)
23+
protected function execute(\Zend_Log $logger)
2424
{
2525
$reflector = $this->getClassReflector();
2626
$changeLog = $this->getChangeLog();
@@ -39,7 +39,7 @@ protected function execute(\Zend\Log\Logger $logger)
3939
}
4040
}
4141

42-
private function updateDocBlock(ClassReflector $reflector, $className, $methodName, $expectedSince, \Zend\Log\Logger $logger)
42+
private function updateDocBlock(ClassReflector $reflector, $className, $methodName, $expectedSince, \Zend_Log $logger)
4343
{
4444
$reflectionClass = $reflector->reflect($className);
4545
$reflectionMethod = null;

‎code/CodeUpdater/DeprecatedProperties.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ protected function getLogType()
1919
}
2020

2121
/**
22-
* @param \Zend\Log\Logger $logger
22+
* @param \Zend_Log $logger
2323
*/
24-
protected function execute(\Zend\Log\Logger $logger)
24+
protected function execute(\Zend_Log $logger)
2525
{
2626
$reflector = $this->getClassReflector();
2727
$changeLog = $this->getChangeLog();
@@ -40,7 +40,7 @@ protected function execute(\Zend\Log\Logger $logger)
4040
}
4141
}
4242

43-
private function updateDocBlock(ClassReflector $reflector, $className, $propertyName, $expectedSince, \Zend\Log\Logger $logger)
43+
private function updateDocBlock(ClassReflector $reflector, $className, $propertyName, $expectedSince, \Zend_Log $logger)
4444
{
4545
$reflectionClass = $reflector->reflect($className);
4646
/** @var ReflectionProperty $reflectionProperty */

‎code/CodeUpdater/SinceClasses.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ protected function getLogType()
2020
}
2121

2222
/**
23-
* @param \Zend\Log\Logger $logger
23+
* @param \Zend_Log $logger
2424
*/
25-
protected function execute(\Zend\Log\Logger $logger)
25+
protected function execute(\Zend_Log $logger)
2626
{
2727
$reflector = $this->getClassReflector();
2828
$changeLog = $this->getChangeLog();

‎code/CodeUpdater/SinceMethods.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ protected function getLogType()
1818
}
1919

2020
/**
21-
* @param \Zend\Log\Logger $logger
21+
* @param \Zend_Log $logger
2222
*/
23-
protected function execute(\Zend\Log\Logger $logger)
23+
protected function execute(\Zend_Log $logger)
2424
{
2525
$reflector = $this->getClassReflector();
2626
$changeLog = $this->getChangeLog();
@@ -39,7 +39,7 @@ protected function execute(\Zend\Log\Logger $logger)
3939
}
4040
}
4141

42-
private function updateClassDocBlock(ClassReflector $reflector, $className, $methodName, $since, \Zend\Log\Logger $logger)
42+
private function updateClassDocBlock(ClassReflector $reflector, $className, $methodName, $since, \Zend_Log $logger)
4343
{
4444
$reflectionClass = $reflector->reflect($className);
4545

‎code/CodeUpdater/SinceProperties.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ protected function getLogType()
1818
}
1919

2020
/**
21-
* @param \Zend\Log\Logger $logger
21+
* @param \Zend_Log $logger
2222
*/
23-
protected function execute(\Zend\Log\Logger $logger)
23+
protected function execute(\Zend_Log $logger)
2424
{
2525
$reflector = $this->getClassReflector();
2626
$changeLog = $this->getChangeLog();
@@ -39,7 +39,7 @@ protected function execute(\Zend\Log\Logger $logger)
3939
}
4040
}
4141

42-
private function updateClassDocBlock(ClassReflector $reflector, $className, $propertyName, $since, \Zend\Log\Logger $logger)
42+
private function updateClassDocBlock(ClassReflector $reflector, $className, $propertyName, $since, \Zend_Log $logger)
4343
{
4444
$reflectionClass = $reflector->reflect($className);
4545

0 commit comments

Comments
 (0)