#2 fix services, namespaces and use of c5 singletons

1stthomas · May 24, 2021 · 7a84145 · 7a84145
1 parent 6f90764
commit 7a84145
Show file tree

Hide file tree

Showing 16 changed files with 205 additions and 432 deletions.
diff --git a/src/Concrete/Controllers/Environment.php b/src/Concrete/Controllers/Environment.php
diff --git a/src/Concrete/Controllers/Packages.php b/src/Concrete/Controllers/Packages.php
diff --git a/src/Concrete/Entity/ComposerPackage.php b/src/Concrete/Entity/ComposerPackage.php
diff --git a/src/Concrete/Entity/ComposerPackageRequire.php b/src/Concrete/Entity/ComposerPackageRequire.php
diff --git a/src/Concrete/Entity/OrmEntityBase.php b/src/Concrete/Entity/OrmEntityBase.php
@@ -2,24 +2,15 @@
 
 namespace Concrete\Package\Ht7C5Base\Entity;
 
-use \DateTime;
-use \Concrete\Package\Ht7C5Base\Traits\CanPackageBasics;
+use \Concrete\Core\Support\Facade\Application;
+use \Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @MappedSuperclass
  */
 class OrmEntityBase
 {
 
-    use CanPackageBasics;
-
-    /**
-     * The c5 application facade.
-     *
-     * @var     \Concrete\Core\Support\Facade\Application
-     */
-    protected static $app;
-
     /**
      * Create a new instance of the underlying entity.
      *
@@ -30,10 +21,10 @@ class OrmEntityBase
     public function __construct()
     {
         if (property_exists($this, 'createdAt')) {
-            $this->createdAt = new DateTime('now');
+            $this->createdAt = new \DateTime('now');
         }
         if (property_exists($this, 'updatedAt')) {
-            $this->updatedAt = new DateTime('now');
+            $this->updatedAt = new \DateTime('now');
         }
     }
 
@@ -53,14 +44,21 @@ public function __construct()
      */
     public function delete($respectSettings = true)
     {
-        if (property_exists(get_called_class(), 'safeDelete') && static::$safeDelete && property_exists($this, 'deletedAt') && $respectSettings) {
-            $this->deletedAt = new DateTime('now');
+        if (property_exists(get_called_class(), 'safeDelete') &&
+                static::$safeDelete &&
+                property_exists($this, 'deletedAt') &&
+                $respectSettings) {
+            $this->deletedAt = new \DateTime('now');
+
             if (property_exists($this, 'updatedAt')) {
-                $this->updatedAt = new DateTime('now');
+                $this->updatedAt = new \DateTime('now');
             }
+
             $this->save();
         } else {
-            $em = self::getEm();
+            $em = Application::getFacadeApplication()
+                    ->make(EntityManagerInterface::class);
+
             $em->remove($this);
             $em->flush();
         }
@@ -75,9 +73,12 @@ public function delete($respectSettings = true)
     public function save()
     {
         if (property_exists($this, 'updatedAt')) {
-            $this->updatedAt = new DateTime('now');
+            $this->updatedAt = new \DateTime('now');
         }
-        $em = self::getEm();
+
+        $em = Application::getFacadeApplication()
+                ->make(EntityManagerInterface::class);
+
         $em->persist($this);
         $em->flush();
     }

diff --git a/src/Concrete/Entity/OrmEntityExtended.php b/src/Concrete/Entity/OrmEntityExtended.php
@@ -2,8 +2,9 @@
 
 namespace Concrete\Package\Ht7C5Base\Entity;
 
-use \InvalidArgumentException;
+use \Concrete\Core\Support\Facade\Application;
 use \Concrete\Package\Ht7C5Base\Traits\CanLoad;
+use \Doctrine\ORM\EntityManagerInterface;
 
 /**
  * @MappedSuperclass
@@ -55,10 +56,6 @@ public function __construct(array $data = [])
         parent::__construct();
 
         $this->load($data);
-
-//        if (!empty($data)) {
-//            $this->load($data);
-//        }
     }
 
     /**
@@ -137,7 +134,8 @@ public static function isActiveSafeDelete()
      */
     public static function getByID($id, $respectSafeDeleteProperty = true)
     {
-        $em = self::getEm();
+        $em = Application::getFacadeApplication()
+                ->make(EntityManagerInterface::class);
 
         if ($respectSafeDeleteProperty && static::$safeDelete) {
             return $em->getRepository(static::class)
@@ -170,14 +168,13 @@ public static function getOrFailByID($id, $respectSafeDeleteProperty = true)
             $classNs = static::class;
             $className = substr($classNs, strrpos($classNs, '\\') + 1);
             $entityName = strpos($className, 'MeschCm') !== false ? str_replace('MeschCm', '', $className) : $className;
-            // Create the exception message
+
             $msg = tc(
                     'ht7_c5_base',
                     'The requested %1$s with the id %2$s could not be found.',
                     $entityName, $id
             );
-            throw new InvalidArgumentException($msg);
-//            throw new MeschPageNotFoundException($msg);
+            throw new \InvalidArgumentException($msg);
         }
     }
 

diff --git a/src/Concrete/Repository/ComposerPackageRequireRepository.php b/src/Concrete/Repository/ComposerPackageRequireRepository.php
diff --git a/src/Concrete/ServiceProvider.php b/src/Concrete/ServiceProvider.php
@@ -3,8 +3,9 @@
 namespace Concrete\Package\Ht7C5Base;
 
 use \Concrete\Core\Foundation\Service\Provider as CoreServiceProvider;
-use \Concrete\Package\Ht7C5Base\Service\Files\NameFixer;
-use \Concrete\Package\Ht7C5Base\Service\Users\User;
+use \Concrete\Package\Ht7C5Base\Services\FileNameFixer;
+use \Concrete\Package\Ht7C5Base\Services\PackageBase;
+use \Concrete\Package\Ht7C5Base\Services\UserBase;
 
 class ServiceProvider extends CoreServiceProvider
 {
@@ -13,15 +14,16 @@ public function register()
     {
         $this->app->bind(
                 'helper/ht7/file/namefixer',
-                NameFixer::class
+                FileNameFixer::class
         );
         $this->app->bind(
-                'helper/ht7/users/user',
-                User::class
+                'helper/ht7/package/base',
+                PackageBase::class
+        );
+        $this->app->bind(
+                'helper/ht7/user/base',
+                UserBase::class
         );
-
-        // Add these classes as singleton to have only one active instance of them.
-//        $this->app->singleton(LogEvents::class);
     }
 
 }