Disable admin mode by default (#2)

CHANGELOG.md

@@ -12,3 +12,9 @@
  ```
 - The second parameter (`$value`) of `Neusta\Pimcore\TestingFramework\Pimcore\BootstrapPimcore::setEnv()`
  is now of type `string`.
+- Admin mode will be disabled by default when bootstrapping pimcore.
+- The `WithoutAdminMode` trait was removed.
+
+### Bugfixes:
+
+- Reset admin mode to previous state after each test class when using `WithAdminMode` trait.

README.md

@@ -71,8 +71,9 @@ We provide traits to switch common behavior on/off in whole test case classes.
 
 #### Admin Mode
 
-- `WithAdminMode`
-- `WithoutAdminMode`
+The admin mode is disabled by default when calling `BootstrapPimcore::bootstrap()`. 
+
+To enable it again, you can use the `WithAdminMode` trait.
 
 #### Cache
 

src/Pimcore/AdminMode.php

@@ -4,7 +4,7 @@
 
 namespace Neusta\Pimcore\TestingFramework\Pimcore;
 
-use Pimcore\Model\DataObject\AbstractObject;
+use Pimcore\Model\DataObject;
 use Pimcore\Model\DataObject\Localizedfield;
 use Pimcore\Model\Document;
 
@@ -14,17 +14,22 @@ public static function enable(): void
  {
  \Pimcore::setAdminMode();
  Document::setHideUnpublished(false);
- AbstractObject::setHideUnpublished(false);
- AbstractObject::setGetInheritedValues(false);
+ DataObject::setHideUnpublished(false);
+ DataObject::setGetInheritedValues(false);
  Localizedfield::setGetFallbackValues(false);
  }
 
  public static function disable(): void
  {
  \Pimcore::unsetAdminMode();
  Document::setHideUnpublished(true);
- AbstractObject::setHideUnpublished(true);
- AbstractObject::setGetInheritedValues(true);
+ DataObject::setHideUnpublished(true);
+ DataObject::setGetInheritedValues(true);
  Localizedfield::setGetFallbackValues(true);
  }
+
+ public static function isEnabled(): bool
+ {
+ return \Pimcore::inAdmin();
+ }
 }

src/Pimcore/BootstrapPimcore.php

@@ -20,6 +20,7 @@ public static function bootstrap(string ...$envVars): void
 
  Bootstrap::setProjectRoot();
  Bootstrap::bootstrap();
+ AdminMode::disable();
  }
 
  public static function setEnv(string $name, string $value): void

src/Pimcore/WithAdminMode.php

@@ -6,13 +6,29 @@
 
 trait WithAdminMode
 {
+ /** @internal */
+ private static bool $adminModeWasEnabled;
+
  /**
  * @internal
  *
  * @beforeClass
  */
  public static function _enableAdminMode(): void
  {
+ self::$adminModeWasEnabled = AdminMode::isEnabled();
  AdminMode::enable();
  }
+
+ /**
+ * @internal
+ *
+ * @afterClass
+ */
+ public static function _resetAdminMode(): void
+ {
+ if (false === self::$adminModeWasEnabled) {
+ AdminMode::disable();
+ }
+ }
 }