diff --git a/packages/Annotation/src/AnnotationDecorator.php b/packages/Annotation/src/AnnotationDecorator.php
index f7a401f44..fc03352df 100644
--- a/packages/Annotation/src/AnnotationDecorator.php
+++ b/packages/Annotation/src/AnnotationDecorator.php
@@ -6,8 +6,9 @@
use ApiGen\Reflection\Contract\Reflection\AbstractReflectionInterface;
use phpDocumentor\Reflection\DocBlock\Tag;
-# see: https://github.com/phpDocumentor/TypeResolver#resolving-an-fqsen
-
+/**
+ * @link https://github.com/phpDocumentor/TypeResolver#resolving-an-fqsen
+ */
final class AnnotationDecorator
{
/**
diff --git a/packages/Element/src/ReflectionCollector/AnnotationReflectionCollector.php b/packages/Element/src/ReflectionCollector/AnnotationReflectionCollector.php
index bd6b9a5f2..33f93cd59 100644
--- a/packages/Element/src/ReflectionCollector/AnnotationReflectionCollector.php
+++ b/packages/Element/src/ReflectionCollector/AnnotationReflectionCollector.php
@@ -2,7 +2,7 @@
namespace ApiGen\Element\ReflectionCollector;
-use ApiGen\Contract\Configuration\ConfigurationInterface;
+use ApiGen\Configuration\Configuration;
use ApiGen\Reflection\Contract\Reflection\AbstractReflectionInterface;
use ApiGen\Reflection\Contract\Reflection\Class_\ClassConstantReflectionInterface;
use ApiGen\Reflection\Contract\Reflection\Class_\ClassMethodReflectionInterface;
@@ -20,7 +20,7 @@
final class AnnotationReflectionCollector extends AbstractReflectionCollector
{
/**
- * @var ConfigurationInterface
+ * @var Configuration
*/
private $configuration;
@@ -29,7 +29,7 @@ final class AnnotationReflectionCollector extends AbstractReflectionCollector
*/
private $activeAnnotation;
- public function __construct(ConfigurationInterface $configuration)
+ public function __construct(Configuration $configuration)
{
$this->configuration = $configuration;
}
diff --git a/packages/Element/tests/ReflectionCollector/AnnotationReflectionCollectorTest.php b/packages/Element/tests/ReflectionCollector/AnnotationReflectionCollectorTest.php
index c0f81771c..f9c286104 100644
--- a/packages/Element/tests/ReflectionCollector/AnnotationReflectionCollectorTest.php
+++ b/packages/Element/tests/ReflectionCollector/AnnotationReflectionCollectorTest.php
@@ -3,7 +3,7 @@
namespace ApiGen\Element\Tests\ReflectionCollector;
use ApiGen\Annotation\AnnotationList;
-use ApiGen\Contract\Configuration\ConfigurationInterface;
+use ApiGen\Configuration\Configuration;
use ApiGen\Element\ReflectionCollector\AnnotationReflectionCollector;
use ApiGen\ModularConfiguration\Option\AnnotationGroupsOption;
use ApiGen\ModularConfiguration\Option\DestinationOption;
@@ -20,8 +20,8 @@ final class AnnotationReflectionCollectorTest extends AbstractContainerAwareTest
protected function setUp(): void
{
- /** @var ConfigurationInterface $configuration */
- $configuration = $this->container->getByType(ConfigurationInterface::class);
+ /** @var Configuration $configuration */
+ $configuration = $this->container->getByType(Configuration::class);
$configuration->resolveOptions([
SourceOption::NAME => [__DIR__],
DestinationOption::NAME => TEMP_DIR,
diff --git a/packages/Reflection/src/Reflection/Class_/ClassReflection.php b/packages/Reflection/src/Reflection/Class_/ClassReflection.php
index 9aa274419..905f359bb 100644
--- a/packages/Reflection/src/Reflection/Class_/ClassReflection.php
+++ b/packages/Reflection/src/Reflection/Class_/ClassReflection.php
@@ -128,12 +128,13 @@ public function getInheritedDescription(): ?string
public function getParentClass(): ?ClassReflectionInterface
{
- if (! $this->betterClassReflection->getParentClass()) {
+ $parentClassName = get_parent_class($this->getName());
+ if ($parentClassName === false) {
return null;
}
return $this->transformerCollector->transformSingle(
- $this->betterClassReflection->getParentClass()
+ ReflectionClass::createFromName($parentClassName)
);
}
diff --git a/packages/Reflection/src/TransformerCollector.php b/packages/Reflection/src/TransformerCollector.php
index 89d5ec03a..165a65e35 100644
--- a/packages/Reflection/src/TransformerCollector.php
+++ b/packages/Reflection/src/TransformerCollector.php
@@ -94,7 +94,7 @@ private function hasAllowedAccessLevel($transformedReflection): bool
return true;
}
- // hardcoded @todo make service-like and using ConfigurationInterface
+ // hardcoded @todo make service-like and using Configuration
if ($transformedReflection->isPublic() || $transformedReflection->isProtected()) {
return true;
}
diff --git a/packages/StringRouting/tests/Route/SourceCodeRouteTest.php b/packages/StringRouting/tests/Route/SourceCodeRouteTest.php
index 89486d532..f57868aae 100644
--- a/packages/StringRouting/tests/Route/SourceCodeRouteTest.php
+++ b/packages/StringRouting/tests/Route/SourceCodeRouteTest.php
@@ -2,7 +2,7 @@
namespace ApiGen\StringRouting\Tests\Route;
-use ApiGen\Contract\Configuration\ConfigurationInterface;
+use ApiGen\Configuration\Configuration;
use ApiGen\ModularConfiguration\Option\DestinationOption;
use ApiGen\ModularConfiguration\Option\SourceOption;
use ApiGen\Reflection\Contract\Reflection\Class_\ClassConstantReflectionInterface;
@@ -30,8 +30,8 @@ final class SourceCodeRouteTest extends AbstractContainerAwareTestCase
protected function setUp(): void
{
$this->stringRouter = $this->container->getByType(StringRouter::class);
- /** @var ConfigurationInterface $configuration */
- $configuration = $this->container->getByType(ConfigurationInterface::class);
+ /** @var Configuration $configuration */
+ $configuration = $this->container->getByType(Configuration::class);
$configuration->resolveOptions([
SourceOption::NAME => [__DIR__],
DestinationOption::NAME => TEMP_DIR
diff --git a/packages/ThemeDefault/src/404.latte b/packages/ThemeDefault/src/404.latte
index 5ed3d8bde..623434909 100644
--- a/packages/ThemeDefault/src/404.latte
+++ b/packages/ThemeDefault/src/404.latte
@@ -3,10 +3,8 @@
{block title}Page not found{/block}
{block content}
-
{include title}
The requested page could not be found.
You have probably clicked on a link that is outdated and points to a page that does not exist any more or you have made an typing error in the address.
To continue please try to find requested page in the menu or use search field on the top.
-
{/block}
diff --git a/packages/ThemeDefault/src/@layout.latte b/packages/ThemeDefault/src/@layout.latte
index e554e9a37..6da535b09 100644
--- a/packages/ThemeDefault/src/@layout.latte
+++ b/packages/ThemeDefault/src/@layout.latte
@@ -16,11 +16,11 @@
+ {include "partial/menu.latte"}
+
- {include searchForm}
- {include "partial/menu.latte"}
{include content}
{include footer}
@@ -37,13 +37,6 @@
-{define searchForm}
-
-{/define}
-
-
{define footer}