Merge branch 'master' of https://github.com/zynga/zynga-hacklang-fram…

…ework

src/Zynga/Framework/Factory/V2/Base.hh

@@ -20,6 +20,7 @@ use Zynga\Framework\Factory\V2\Interfaces\DriverInterface;
 abstract class Base implements FactoryInterface {
 
   private static Map<string, FactoryTemplateInterface> $_template = Map {};
+  private static Map<string, string> $_mockOverrides = Map {};
 
   abstract public static function getClassRoot(): string;
 
@@ -87,8 +88,14 @@ abstract class Base implements FactoryInterface {
         // --
         $driver = $template->factory($name);
 
-        $name = 'Mock';
-
+        if (self::$_mockOverrides->containsKey($name)) {
+          $name = self::$_mockOverrides[$name];
+        } else if (strpos($name, 'Mock\\') !== false ||
+                   strpos($name, 'Mock_') !== false) {
+          // No-op since Factory is pointing to a Mock Namespace
+        } else {
+          $name = 'Mock';
+        }
       }
 
       $driver = $template->factory($name);
@@ -168,7 +175,19 @@ abstract class Base implements FactoryInterface {
 
   public static function disableMockDrivers(): bool {
     $template = self::getFactoryTemplate();
+    self::clearOverridenMockDrivers();
     return $template->disableMockDrivers();
   }
 
+  public static function overrideMockDriver(
+    string $actualClass,
+    string $mockClass,
+  ): void {
+    self::enableMockDrivers();
+    self::$_mockOverrides[$actualClass] = $mockClass;
+  }
+
+  public static function clearOverridenMockDrivers(): void {
+    self::$_mockOverrides = Map {};
+  }
 }

src/Zynga/Framework/Factory/V2/BaseTest.hh

@@ -32,6 +32,11 @@ class BaseTest extends TestCase {
     return true;
   }
 
+  public function tearDown(): void {
+    TestFactory::clearOverridenMockDrivers();
+    parent::tearDown();
+  }
+
   public function test_construct(): void {
     $foo = new FactoryTemplate("Zynga\Factory\Test");
     $this->assertTrue($foo instanceof FactoryTemplate);
@@ -131,6 +136,44 @@ class BaseTest extends TestCase {
     $this->assertTrue(TestFactory::addClassRoot('\\SomeOther\ClassRoot'));
   }
 
+  public function testOverridingMockDrivers(): void {
+    TestFactory::enableMockDrivers();
+    TestFactory::clearOverridenMockDrivers();
+
+    TestFactory::overrideMockDriver('Mock', 'MockOverride');
+    $driver = TestFactory::factory(TestDriverInterface::class, 'Mock');
+    $config = $driver->getConfig();
+
+    $expected = 'This-is-overridden-'.DevelopmentMode::getModeAsString();
+    if ($config instanceof TestDriverConfigInterface) {
+      $this->assertEquals($expected, $config->getExampleConfigValue());
+    } else {
+      $this->fail('config should be TestDriverConfigInterface');
+    }
+  }
+
+  public function testMockDriversClassPathsAreNotOverriden(): void {
+    TestFactory::enableMockDrivers();
+    TestFactory::clearOverridenMockDrivers();
+
+    $driver = TestFactory::factory(TestDriverInterface::class, 'Mock\Reader');
+    $driver2 =
+      TestFactory::factory(TestDriverInterface::class, 'Mock_Reader');
+
+    $expected = 'This-is-'.DevelopmentMode::getModeAsString().'-Reader';
+
+    $config = $driver->getConfig();
+    $config2 = $driver2->getConfig();
+
+    if ($config instanceof TestDriverConfigInterface &&
+        $config2 instanceof TestDriverConfigInterface) {
+      $this->assertEquals($expected, $config->getExampleConfigValue());
+      $this->assertEquals($expected, $config2->getExampleConfigValue());
+    } else {
+      $this->fail('config should be TestDriverConfigInterface');
+    }
+  }
+
   public function testFactoryLoadWithWrongInterface(): void {
 
     // --

src/Zynga/Framework/Factory/V2/Test/Config/Mock/Reader/Base.hh

@@ -0,0 +1,12 @@
+<?hh // strict
+
+namespace Zynga\Framework\Factory\V2\Test\Config\Mock\Reader;
+
+use Zynga\Framework\Factory\V2\Config\Base as ConfigBase;
+use Zynga\Framework\Factory\V2\Test\Interfaces\ConfigInterface;
+
+abstract class Base extends ConfigBase implements ConfigInterface {
+  public function getDriver(): string {
+    return 'Mock';
+  }
+}

src/Zynga/Framework/Factory/V2/Test/Config/Mock/Reader/Dev.hh

@@ -0,0 +1,11 @@
+<?hh // strict
+
+namespace Zynga\Framework\Factory\V2\Test\Config\Mock\Reader;
+
+use Zynga\Framework\Factory\V2\Test\Config\Mock\Base as ConfigBase;
+
+class Dev extends ConfigBase {
+  public function getExampleConfigValue(): string {
+    return 'This-is-Dev-Reader';
+  }
+}

src/Zynga/Framework/Factory/V2/Test/Config/Mock/Reader/DevTest.hh

@@ -0,0 +1,14 @@
+<?hh //strict
+
+namespace Zynga\Framework\Factory\V2\Test\Config\Mock\Reader;
+
+use Zynga\Framework\Testing\TestCase\V2\Base as TestCase;
+
+use Zynga\Framework\Factory\V2\Test\Config\Mock\Reader\Dev as TestConfig;
+
+class DevTest extends TestCase {
+  public function test_configValues(): void {
+    $obj = new TestConfig();
+    $this->assertEquals('This-is-Dev-Reader', $obj->getExampleConfigValue());
+  }
+}

src/Zynga/Framework/Factory/V2/Test/Config/Mock/Reader/Production.hh

@@ -0,0 +1,11 @@
+<?hh // strict
+
+namespace Zynga\Framework\Factory\V2\Test\Config\Mock\Reader;
+
+use Zynga\Framework\Factory\V2\Test\Config\Mock\Base as ConfigBase;
+
+class Production extends ConfigBase {
+  public function getExampleConfigValue(): string {
+    return 'This-is-Production-Reader';
+  }
+}

src/Zynga/Framework/Factory/V2/Test/Config/Mock/Reader/ProductionTest.hh

@@ -0,0 +1,19 @@
+<?hh //strict
+
+namespace Zynga\Framework\Factory\V2\Test\Config\Mock\Reader;
+
+use Zynga\Framework\Testing\TestCase\V2\Base as TestCase;
+
+use
+  Zynga\Framework\Factory\V2\Test\Config\Mock\Reader\Production as TestConfig
+;
+
+class ProductionTest extends TestCase {
+  public function test_configValues(): void {
+    $obj = new TestConfig();
+    $this->assertEquals(
+      'This-is-Production-Reader',
+      $obj->getExampleConfigValue(),
+    );
+  }
+}

src/Zynga/Framework/Factory/V2/Test/Config/Mock/Reader/Staging.hh

@@ -0,0 +1,11 @@
+<?hh // strict
+
+namespace Zynga\Framework\Factory\V2\Test\Config\Mock\Reader;
+
+use Zynga\Framework\Factory\V2\Test\Config\Mock\Base as ConfigBase;
+
+class Staging extends ConfigBase {
+  public function getExampleConfigValue(): string {
+    return 'This-is-Staging-Reader';
+  }
+}

src/Zynga/Framework/Factory/V2/Test/Config/Mock/Reader/StagingTest.hh

@@ -0,0 +1,17 @@
+<?hh //strict
+
+namespace Zynga\Framework\Factory\V2\Test\Config\Mock\Reader;
+
+use Zynga\Framework\Testing\TestCase\V2\Base as TestCase;
+
+use Zynga\Framework\Factory\V2\Test\Config\Mock\Reader\Staging as TestConfig;
+
+class StagingTest extends TestCase {
+  public function test_configValues(): void {
+    $obj = new TestConfig();
+    $this->assertEquals(
+      'This-is-Staging-Reader',
+      $obj->getExampleConfigValue(),
+    );
+  }
+}

src/Zynga/Framework/Factory/V2/Test/Config/MockOverride/Base.hh

@@ -0,0 +1,12 @@
+<?hh // strict
+
+namespace Zynga\Framework\Factory\V2\Test\Config\MockOverride;
+
+use Zynga\Framework\Factory\V2\Config\Base as ConfigBase;
+use Zynga\Framework\Factory\V2\Test\Interfaces\ConfigInterface;
+
+abstract class Base extends ConfigBase implements ConfigInterface {
+  public function getDriver(): string {
+    return 'Mock';
+  }
+}

src/Zynga/Framework/Factory/V2/Test/Config/MockOverride/Dev.hh

@@ -0,0 +1,11 @@
+<?hh // strict
+
+namespace Zynga\Framework\Factory\V2\Test\Config\MockOverride;
+
+use Zynga\Framework\Factory\V2\Test\Config\MockOverride\Base as ConfigBase;
+
+class Dev extends ConfigBase {
+  public function getExampleConfigValue(): string {
+    return 'This-is-overridden-Dev';
+  }
+}

src/Zynga/Framework/Factory/V2/Test/Config/MockOverride/DevTest.hh

@@ -0,0 +1,17 @@
+<?hh //strict
+
+namespace Zynga\Framework\Factory\V2\Test\Config\MockOverride;
+
+use Zynga\Framework\Testing\TestCase\V2\Base as TestCase;
+
+use Zynga\Framework\Factory\V2\Test\Config\MockOverride\Dev as TestConfig;
+
+class DevTest extends TestCase {
+  public function test_configValues(): void {
+    $obj = new TestConfig();
+    $this->assertEquals(
+      'This-is-overridden-Dev',
+      $obj->getExampleConfigValue(),
+    );
+  }
+}

src/Zynga/Framework/Factory/V2/Test/Config/MockOverride/Production.hh

@@ -0,0 +1,11 @@
+<?hh // strict
+
+namespace Zynga\Framework\Factory\V2\Test\Config\MockOverride;
+
+use Zynga\Framework\Factory\V2\Test\Config\MockOverride\Base as ConfigBase;
+
+class Production extends ConfigBase {
+  public function getExampleConfigValue(): string {
+    return 'This-is-overridden-Production';
+  }
+}

src/Zynga/Framework/Factory/V2/Test/Config/MockOverride/ProductionTest.hh

@@ -0,0 +1,19 @@
+<?hh //strict
+
+namespace Zynga\Framework\Factory\V2\Test\Config\MockOverride;
+
+use Zynga\Framework\Testing\TestCase\V2\Base as TestCase;
+
+use
+  Zynga\Framework\Factory\V2\Test\Config\MockOverride\Production as TestConfig
+;
+
+class ProductionTest extends TestCase {
+  public function test_configValues(): void {
+    $obj = new TestConfig();
+    $this->assertEquals(
+      'This-is-overridden-Production',
+      $obj->getExampleConfigValue(),
+    );
+  }
+}

src/Zynga/Framework/Factory/V2/Test/Config/MockOverride/Staging.hh

@@ -0,0 +1,11 @@
+<?hh // strict
+
+namespace Zynga\Framework\Factory\V2\Test\Config\MockOverride;
+
+use Zynga\Framework\Factory\V2\Test\Config\MockOverride\Base as ConfigBase;
+
+class Staging extends ConfigBase {
+  public function getExampleConfigValue(): string {
+    return 'This-is-overridden-Staging';
+  }
+}

src/Zynga/Framework/Factory/V2/Test/Config/MockOverride/StagingTest.hh

@@ -0,0 +1,19 @@
+<?hh //strict
+
+namespace Zynga\Framework\Factory\V2\Test\Config\MockOverride;
+
+use Zynga\Framework\Testing\TestCase\V2\Base as TestCase;
+
+use
+  Zynga\Framework\Factory\V2\Test\Config\MockOverride\Staging as TestConfig
+;
+
+class StagingTest extends TestCase {
+  public function test_configValues(): void {
+    $obj = new TestConfig();
+    $this->assertEquals(
+      'This-is-overridden-Staging',
+      $obj->getExampleConfigValue(),
+    );
+  }
+}

src/Zynga/Framework/PgData/V1/Interfaces/PgModelInterface.hh

@@ -21,8 +21,10 @@ interface PgModelInterface {
   public function getResultSetCacheName(): string;
   public function getReadDatabaseName(): string;
   public function getWriteDatabaseName(): string;
+  public function lockRowCache(PgRowInterface $row): bool;
   public function reader(): ReaderInterface;
   public function stats(): StatsInterface;
+  public function unlockRowCache(PgRowInterface $row): bool;
   public function writer(): WriterInterface;
   public function getByPk<TModelClass as PgRowInterface>(
     classname<TModelClass> $model,

src/Zynga/Framework/PgData/V1/Interfaces/Sharded/PgModelInterface.hh

@@ -7,4 +7,7 @@ use
 ;
 use Zynga\Framework\Type\V1\Interfaces\TypeInterface;
 
-interface PgModelInterface extends PgModelInterfaceBase {}
+interface PgModelInterface extends PgModelInterfaceBase {
+  public function getShardId(): TypeInterface;
+
+}

src/Zynga/Framework/PgData/V1/PgModelFactory.hh

@@ -0,0 +1,26 @@
+<?hh //strict
+
+namespace Zynga\Framework\PgData\V1;
+
+use Zynga\Framework\PgData\V1\Interfaces\PgModelInterface;
+
+abstract class PgModelFactory {
+  private static ?PgModelInterface $_mock;
+
+  public function getModel(): PgModelInterface {
+    if (self::$_mock !== null) {
+      return self::$_mock;
+    }
+    return $this->getRealModel();
+  }
+  public static function enableMock(PgModelInterface $mock): void {
+    self::$_mock = $mock;
+  }
+
+  public static function disableMock(): void {
+    self::$_mock = null;
+  }
+
+  protected abstract function getRealModel(): PgModelInterface;
+
+}

src/Zynga/Framework/PgData/V1/PgShardedModelFactory.hh

@@ -0,0 +1,30 @@
+<?hh //strict
+
+namespace Zynga\Framework\PgData\V1;
+
+use Zynga\Framework\PgData\V1\Interfaces\Sharded\PgModelInterface;
+use Zynga\Framework\Type\V1\Interfaces\TypeInterface;
+
+abstract class PgShardedModelFactory {
+  private static ?PgModelInterface $_mock;
+
+  public function __construct(private TypeInterface $_shardKey) {}
+
+  public function getModel(): PgModelInterface {
+    if (self::$_mock !== null) {
+      return self::$_mock;
+    }
+    return $this->getRealModel();
+  }
+
+  public static function enableMock(PgModelInterface $mock): void {
+    self::$_mock = $mock;
+  }
+
+  public static function disableMock(): void {
+    self::$_mock = null;
+  }
+
+  protected abstract function getRealModel(): PgModelInterface;
+
+}