Skip to content
Browse files

namespace refactoring: fix broken classes

  • Loading branch information...
1 parent fdc0288 commit 92b10fc822e20565fe8cc7a81eb5fecec4ffe088 @planetenkiller committed Dec 18, 2011
View
1 src/lib/Zikula/Common/HookManager/HookManager.php
@@ -16,7 +16,6 @@
namespace Zikula\Common\HookManager;
use Zikula\Common\EventManager\EventManager;
-use Zikula\Common\HookManager\HookInterface;
/**
View
6 src/lib/Zikula/Core/Doctrine/Entity/Category.php
@@ -22,7 +22,7 @@
* @ORM\Entity
* @ORM\Table(name="categories_category")
*/
-class Zikula_Doctrine2_Entity_Category extends EntityAccess
+class Category extends EntityAccess
{
/**
* @ORM\Id
@@ -33,14 +33,14 @@ class Zikula_Doctrine2_Entity_Category extends EntityAccess
private $id;
/**
- * @ORM\ManyToOne(targetEntity="Zikula\\Doctrine\\Core\\Entity\\Category", inversedBy="children")
+ * @ORM\ManyToOne(targetEntity="Zikula\Core\Doctrine\Entity\Category", inversedBy="children")
* @ORM\JoinColumn(name="parent_id", referencedColumnName="id")
* @var Zikula_Doctrine2_Entity_Category
*/
private $parent;
/**
- * @ORM\OneToMany(targetEntity="Zikula\\Doctrine\\Core\\Entity\\Category", mappedBy="parent")
+ * @ORM\OneToMany(targetEntity="Zikula\Core\Doctrine\Entity\Category", mappedBy="parent")
* @var \Zikula\Core\Doctrine\Entity\Category
*/
private $children;
View
4 src/lib/Zikula/Core/Doctrine/Entity/EntityCategory.php
@@ -38,9 +38,9 @@
private $categoryRegistryId;
/**
- * @ORM\ManyToOne(targetEntity="Zikula\\Doctrine\\Core\\Entity\\Category")
+ * @ORM\ManyToOne(targetEntity="Zikula\Core\Doctrine\Entity\Category")
* @ORM\JoinColumn(name="categoryId", referencedColumnName="id")
- * @var Zikula_Doctrine2_Entity_Category
+ * @var Zikula\Core\Doctrine\Entity\Category
*/
private $category;
View
6 src/lib/Zikula/Core/Doctrine/EntityAccess.php
@@ -12,7 +12,9 @@
* information regarding copyright and licensing.
*/
-class Zikula_EntityAccess implements ArrayAccess
+namespace Zikula\Core\Doctrine;
+
+class EntityAccess implements \ArrayAccess
{
/**
* @var ReflectionObject
@@ -30,7 +32,7 @@ public function getReflection()
return $this->reflection;
}
- $this->reflection = new ReflectionObject($this);
+ $this->reflection = new \ReflectionObject($this);
return $this->reflection;
}
View
2 src/lib/Zikula/Core/Doctrine/Logger/ZikulaSqlLogger.php
@@ -34,6 +34,6 @@ public function stopQuery()
$query['time'] = microtime(true) - $this->start;
$zevent = new GenericEvent('log.sql', null, $query);
- EventUtil::notify($zevent);
+ \EventUtil::notify($zevent);
}
}
View
4 src/lib/Zikula/Framework/AbstractPlugin.php
@@ -478,7 +478,7 @@ public function setBooted()
*/
public function isEnabled()
{
- if ($this instanceof Zikula\Framework\Plugin\AlwaysOnInterface) {
+ if ($this instanceof \Zikula\Framework\Plugin\AlwaysOnInterface) {
return true;
}
@@ -493,7 +493,7 @@ public function isEnabled()
*/
public function isInstalled()
{
- if ($this instanceof Zikula\Framework\Plugin\AlwaysOnInterface) {
+ if ($this instanceof \Zikula\Framework\Plugin\AlwaysOnInterface) {
return true;
}
View
4 src/lib/Zikula/Framework/Controller/AbstractController.php
@@ -16,7 +16,7 @@
namespace Zikula\Framework\Controller;
use Zikula\Framework\AbstractBase;
use Zikula\Framework\Exception\NotFoundException;
-use Zikula\Common\HookManager\HookInterface;
+use Zikula\Common\HookManager\Hook;
use \Zikula\Core\Event\GenericEvent;
use Zikula_View;
@@ -86,7 +86,7 @@ public function getView()
*
* @return HookInterface
*/
- public function notifyHooks(HookInterface $hook)
+ public function notifyHooks(Hook $hook)
{
return $this->getService('zikula.hookmanager')->notify($hook);
}
View
21 src/lib/legacy/Zikula/Doctrine2/Entity/EntityAttribute.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright 2010 Zikula Foundation.
+ *
+ * This work is contributed to the Zikula Foundation under one or more
+ * Contributor Agreements and licensed to You under the following license:
+ *
+ * @license GNU/LGPLv3 (or at your option, any later version).
+ * @package Zikula
+ * @subpackage Zikula_Core
+ *
+ * Please see the NOTICE file distributed with this source code for further
+ * information regarding copyright and licensing.
+ */
+
+/**
+ * Zikula_Doctrine2_Entity_EntityAttribute class.
+ */
+abstract class Zikula_Doctrine2_Entity_EntityAttribute extends Zikula\Core\Doctrine\Entity\EntityAttribute {
+
+}
View
21 src/lib/legacy/Zikula/Doctrine2/Entity/EntityCategory.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright 2010 Zikula Foundation.
+ *
+ * This work is contributed to the Zikula Foundation under one or more
+ * Contributor Agreements and licensed to You under the following license:
+ *
+ * @license GNU/LGPLv3 (or at your option, any later version).
+ * @package Zikula
+ * @subpackage Zikula_Core
+ *
+ * Please see the NOTICE file distributed with this source code for further
+ * information regarding copyright and licensing.
+ */
+
+/**
+ * Zikula_Doctrine2_Entity_EntityCategory class.
+ */
+abstract class Zikula_Doctrine2_Entity_EntityCategory extends \Zikula\Core\Doctrine\Entity\EntityCategory {
+
+}
View
21 src/lib/legacy/Zikula/Doctrine2/Entity/EntityMetadata.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright 2010 Zikula Foundation.
+ *
+ * This work is contributed to the Zikula Foundation under one or more
+ * Contributor Agreements and licensed to You under the following license:
+ *
+ * @license GNU/LGPLv3 (or at your option, any later version).
+ * @package Zikula
+ * @subpackage Zikula_Core
+ *
+ * Please see the NOTICE file distributed with this source code for further
+ * information regarding copyright and licensing.
+ */
+
+/**
+ * Zikula_Doctrine2_Entity_EntityMetadata class.
+ */
+abstract class Zikula_Doctrine2_Entity_EntityMetadata extends Zikula\Core\Doctrine\Entity\EntityMetadata {
+
+}
View
21 src/lib/legacy/Zikula/EntityAccess.php
@@ -0,0 +1,21 @@
+<?php
+/**
+ * Copyright 2009 Zikula Foundation.
+ *
+ * This work is contributed to the Zikula Foundation under one or more
+ * Contributor Agreements and licensed to You under the following license:
+ *
+ * @license GNU/LGPLv3 (or at your option, any later version).
+ * @package Zikula
+ *
+ * Please see the NOTICE file distributed with this source code for further
+ * information regarding copyright and licensing.
+ */
+
+/**
+ * Zikula_EntityAccess class.
+ */
+class Zikula_EntityAccess extends Zikula\Core\Doctrine\EntityAccess
+{
+
+}
View
2 src/plugins/DoctrineExtensions/Plugin.php
@@ -43,7 +43,7 @@ protected function getMeta()
*/
public function initialize()
{
- $autoloader = new Zikula_KernelClassLoader();
+ $autoloader = new Zikula\Common\KernelClassLoader();
$autoloader->spl_autoload_register();
$autoloader->register('Gedmo', __DIR__ . '/lib/vendor/l3pp4rd/DoctrineExtensions/lib', '\\');
$autoloader->register('DoctrineExtensions\\StandardFields', __DIR__ . '/lib', '\\');
View
2 src/plugins/Imagine/Plugin.php
@@ -41,7 +41,7 @@ protected function getMeta()
*/
public function initialize()
{
- $autoloader = new Zikula_KernelClassLoader();
+ $autoloader = new Zikula\Common\KernelClassLoader();
$autoloader->spl_autoload_register();
$autoloader->register('Imagine', dirname(__FILE__) . '/lib/vendor', '\\');
}

0 comments on commit 92b10fc

Please sign in to comment.
Something went wrong with that request. Please try again.