Support nightlies

fredemmott · fredemmott · commit ab8d233a3d24 · 2019-02-20T11:28:31.000-08:00
diff --git a/composer.lock b/composer.lock
diff --git a/examples/dorm/CodegenDorm.php b/examples/dorm/CodegenDorm.php
@@ -131,7 +131,7 @@ private function getGetters(): Vector<CodegenMethod> {
       $return_type = $field->getType();
       $data = '$this->data[\''.$field->getDbColumn().'\']';
       if ($return_type === \DateTime::class) {
-        $return_data = 'new DateTime($value)';
+        $return_data = '(new DateTime())->setTimestamp($value)';
       } else {
         $return_data = '$value';
       }
diff --git a/examples/dorm/CodegenMutator.php b/examples/dorm/CodegenMutator.php
@@ -154,7 +154,7 @@ private function getSaveMethod(): CodegenMethod {
       ->addLinef('$conn = new PDO(\'%s\');', $this->schema->getDsn())
       ->addMultilineCall(
         '$quoted = $this->data->mapWithKey',
-        Vector{'($k, $v) ==> $conn->quote($v, self::$pdoType[$k])'},
+        Vector{'($k, $v) ==> $conn->quote((string) $v, self::$pdoType[$k])'},
       )
       ->addAssignment(
         '$id',
diff --git a/examples/dorm/demo/DormUser.php b/examples/dorm/demo/DormUser.php
@@ -6,7 +6,7 @@
  * To re-generate this file run codegen.php DormUserSchema
  *
  *
- * @partially-generated SignedSource<<09509aa1af895b3a95cd41b6c344247c>>
+ * @partially-generated SignedSource<<9e4466dec9ad5e268b1df61c65b84fd3>>
  */
 use namespace Facebook\TypeAssert;
 
@@ -47,7 +47,7 @@ public function getLastName(): string {
 
   public function getBirthday(): ?DateTime {
     $value = $this->data['birthday'] ?? null;
-    return $value === null ? null : new DateTime($value);
+    return $value === null ? null : (new DateTime())->setTimestamp($value);
   }
 
   public function getCountryId(): ?int {
diff --git a/examples/dorm/demo/DormUserMutator.php b/examples/dorm/demo/DormUserMutator.php
@@ -6,7 +6,7 @@
  * To re-generate this file run codegen.php DormUserSchema
  *
  *
- * @partially-generated SignedSource<<9fb8e54530e36453a76d12bf05064db6>>
+ * @partially-generated SignedSource<<3eab32bd5832befe294cd6d493ac3953>>
  */
 
 final class DormUserMutator {
@@ -35,7 +35,7 @@ public function update(int $id): this {
   public function save(): int {
     $conn = new PDO('sqlite:/path/to/database.db');
     $quoted = $this->data->mapWithKey(
-      ($k, $v) ==> $conn->quote($v, self::$pdoType[$k]),
+      ($k, $v) ==> $conn->quote((string) $v, self::$pdoType[$k]),
     );
     $id = $this->id;
     if ($id === null) {
diff --git a/tests/TestLib/ExpectObj.php b/tests/TestLib/ExpectObj.php
@@ -12,18 +12,25 @@
 
 final class ExpectObj<T> extends \Facebook\FBExpect\ExpectObj<T> {
 
-  public function __construct(private T $obj, private string $called_class = '') {
+  public function __construct(
+    private T $obj,
+    private string $called_class = '',
+  ) {
     parent::__construct($obj);
     $this->called_class = $called_class;
   }
 
-  public function toBeUnchanged(?string $token = null, string $msg = '', ...): void {
-    $msg = \vsprintf($msg, \array_slice(\func_get_args(), 2));
+  public function toBeUnchanged(
+    ?string $token = null,
+    string $msg = '',
+    mixed ...$args
+  ): void {
+    $msg = \vsprintf($msg, $args);
     $class_name = $this->called_class;
     $path = CodegenExpectedFile::getPath($class_name);
     $expected = CodegenExpectedFile::parseFile($path);
     $token = $token === null ? CodegenExpectedFile::findToken() : $token;
-    $value = (string) $this->obj;
+    $value = (string)$this->obj;
     if ($expected->contains($token) && $expected[$token] === $value) {
       return;
     }

Original file line number	Diff line number	Diff line change
`@@ -131,7 +131,7 @@ private function getGetters(): Vector<CodegenMethod> {`
`131`	`131`	`$return_type = $field->getType();`
`132`	`132`	`$data = '$this->data[\''.$field->getDbColumn().'\']';`
`133`	`133`	`if ($return_type === \DateTime::class) {`
`134`		`- $return_data = 'new DateTime($value)';`
	`134`	`+ $return_data = '(new DateTime())->setTimestamp($value)';`
`135`	`135`	`} else {`
`136`	`136`	`$return_data = '$value';`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -154,7 +154,7 @@ private function getSaveMethod(): CodegenMethod {`
`154`	`154`	`->addLinef('$conn = new PDO(\'%s\');', $this->schema->getDsn())`
`155`	`155`	`->addMultilineCall(`
`156`	`156`	`'$quoted = $this->data->mapWithKey',`
`157`		`- Vector{'($k, $v) ==> $conn->quote($v, self::$pdoType[$k])'},`
	`157`	`+ Vector{'($k, $v) ==> $conn->quote((string) $v, self::$pdoType[$k])'},`
`158`	`158`	`)`
`159`	`159`	`->addAssignment(`
`160`	`160`	`'$id',`
Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@`
`6`	`6`	`* To re-generate this file run codegen.php DormUserSchema`
`7`	`7`	`*`
`8`	`8`	`*`
`9`		`- * @partially-generated SignedSource<<09509aa1af895b3a95cd41b6c344247c>>`
	`9`	`+ * @partially-generated SignedSource<<9e4466dec9ad5e268b1df61c65b84fd3>>`
`10`	`10`	`*/`
`11`	`11`	`use namespace Facebook\TypeAssert;`
`12`	`12`
`@@ -47,7 +47,7 @@ public function getLastName(): string {`
`47`	`47`
`48`	`48`	`public function getBirthday(): ?DateTime {`
`49`	`49`	`$value = $this->data['birthday'] ?? null;`
`50`		`- return $value === null ? null : new DateTime($value);`
	`50`	`+ return $value === null ? null : (new DateTime())->setTimestamp($value);`
`51`	`51`	`}`
`52`	`52`
`53`	`53`	`public function getCountryId(): ?int {`