Merge pull request #422

jmikola · jmikola · commit 4a9783470a74 · 2016-09-21T16:32:48.000-04:00
diff --git a/tests/bson/bson-decimal128_error-002.phpt b/tests/bson/bson-decimal128_error-002.phpt
@@ -0,0 +1,12 @@
+--TEST--
+MongoDB\BSON\Decimal128 cannot be extended
+--FILE--
+<?php
+
+class MyDecimal128 extends MongoDB\BSON\Decimal128 {}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Fatal error: Class MyDecimal128 may not inherit from final class (MongoDB\BSON\Decimal128) in %s on line %d
diff --git a/tests/bulk/bulkwrite_error-001.phpt b/tests/bulk/bulkwrite_error-001.phpt
@@ -1,10 +1,7 @@
 --TEST--
 MongoDB\Driver\BulkWrite cannot be extended
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
 
 class MyBulkWrite extends MongoDB\Driver\BulkWrite {}
 
diff --git a/tests/command/command_error-001.phpt b/tests/command/command_error-001.phpt
@@ -0,0 +1,12 @@
+--TEST--
+MongoDB\Driver\Command cannot be extended
+--FILE--
+<?php
+
+class MyCommand extends MongoDB\Driver\Command {}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Fatal error: Class MyCommand may not inherit from final class (MongoDB\Driver\Command) in %s on line %d
diff --git a/tests/cursor/cursor_error-001.phpt b/tests/cursor/cursor_error-001.phpt
@@ -1,10 +1,7 @@
 --TEST--
 MongoDB\Driver\Cursor cannot be extended
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
 
 class MyCursor extends MongoDB\Driver\Cursor {}
 
diff --git a/tests/cursorid/cursorid_error-001.phpt b/tests/cursorid/cursorid_error-001.phpt
@@ -1,10 +1,7 @@
 --TEST--
 MongoDB\Driver\CursorId cannot be extended
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
 
 class MyCursorId extends MongoDB\Driver\CursorId {}
 
diff --git a/tests/manager/manager_error-001.phpt b/tests/manager/manager_error-001.phpt
@@ -1,15 +1,12 @@
 --TEST--
-MongoDB\Driver\Query cannot be extended
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
+MongoDB\Driver\Manager cannot be extended
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
 
-class MyQuery extends MongoDB\Driver\Query {}
+class MyManager extends MongoDB\Driver\Manager {}
 
 ?>
 ===DONE===
 <?php exit(0); ?>
 --EXPECTF--
-Fatal error: Class MyQuery may not inherit from final class (MongoDB\Driver\Query) in %s on line %d
+Fatal error: Class MyManager may not inherit from final class (MongoDB\Driver\Manager) in %s on line %d
diff --git a/tests/query/query_error-001.phpt b/tests/query/query_error-001.phpt
@@ -1,10 +1,7 @@
 --TEST--
 MongoDB\Driver\Query cannot be extended
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
 
 class MyQuery extends MongoDB\Driver\Query {}
 
diff --git a/tests/readConcern/readconcern_error-001.phpt b/tests/readConcern/readconcern_error-001.phpt
@@ -1,10 +1,7 @@
 --TEST--
 MongoDB\Driver\ReadConcern cannot be extended
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
 
 class MyReadConcern extends MongoDB\Driver\ReadConcern {}
 
diff --git a/tests/server/server_error-001.phpt b/tests/server/server_error-001.phpt
@@ -1,10 +1,7 @@
 --TEST--
 MongoDB\Driver\Server cannot be extended
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
 
 class MyServer extends MongoDB\Driver\Server {}
 
diff --git a/tests/writeConcern/writeconcern_error-001.phpt b/tests/writeConcern/writeconcern_error-001.phpt
@@ -1,10 +1,7 @@
 --TEST--
 MongoDB\Driver\WriteConcern cannot be extended
---SKIPIF--
-<?php require __DIR__ . "/../utils/basic-skipif.inc"?>
 --FILE--
 <?php
-require_once __DIR__ . "/../utils/basic.inc";
 
 class MyWriteConcern extends MongoDB\Driver\WriteConcern {}
 
diff --git a/tests/writeConcernError/writeconcernerror_error-001.phpt b/tests/writeConcernError/writeconcernerror_error-001.phpt
@@ -0,0 +1,12 @@
+--TEST--
+MongoDB\Driver\WriteConcernError cannot be extended
+--FILE--
+<?php
+
+class MyWriteConcernError extends MongoDB\Driver\WriteConcernError {}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Fatal error: Class MyWriteConcernError may not inherit from final class (MongoDB\Driver\WriteConcernError) in %s on line %d
diff --git a/tests/writeError/writeerror_error-001.phpt b/tests/writeError/writeerror_error-001.phpt
@@ -0,0 +1,12 @@
+--TEST--
+MongoDB\Driver\WriteError cannot be extended
+--FILE--
+<?php
+
+class MyWriteError extends MongoDB\Driver\WriteError {}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Fatal error: Class MyWriteError may not inherit from final class (MongoDB\Driver\WriteError) in %s on line %d
diff --git a/tests/writeResult/writeresult_error-001.phpt b/tests/writeResult/writeresult_error-001.phpt
@@ -0,0 +1,12 @@
+--TEST--
+MongoDB\Driver\WriteResult cannot be extended
+--FILE--
+<?php
+
+class MyWriteResult extends MongoDB\Driver\WriteResult {}
+
+?>
+===DONE===
+<?php exit(0); ?>
+--EXPECTF--
+Fatal error: Class MyWriteResult may not inherit from final class (MongoDB\Driver\WriteResult) in %s on line %d
