From 7ef466c675e3028d31e45a7e449b2dcfb1124a85 Mon Sep 17 00:00:00 2001
From: Hunter Perrin <hperrin@gmail.com>
Date: Fri, 31 May 2019 22:29:18 -0700
Subject: [PATCH] Fix tests. Version bump.

---
 README.md                    |  2 +-
 composer.json                |  4 ++--
 composer.lock                | 12 ++++++------
 src/Nymph.php                |  2 +-
 testing/tests/EntityTest.php |  8 +++-----
 5 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index a670b69..b78a333 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
 
 [![Build Status](https://img.shields.io/travis/sciactive/nymph-server/master.svg)](http://travis-ci.org/sciactive/nymph-server) [![Latest Stable Version](https://img.shields.io/packagist/v/sciactive/nymph-server.svg)](https://packagist.org/packages/sciactive/nymph-server) [![Open Issues](https://img.shields.io/github/issues/sciactive/nymph-server.svg)](https://github.com/sciactive/nymph-server/issues) [![License](https://img.shields.io/github/license/sciactive/nymph-server.svg)]()
 
-Nymph is an object data store for JavaScript and PHP.
+Powerful object data storage and querying for collaborative web apps.
 
 ## Installation
 
diff --git a/composer.json b/composer.json
index 41e631d..a3f86c3 100644
--- a/composer.json
+++ b/composer.json
@@ -1,8 +1,8 @@
 {
   "name": "sciactive/nymph-server",
   "description": "Powerful object data storage and querying for collaborative web apps.",
-  "version": "3.0.0-beta.24",
-  "time": "2019-05-16",
+  "version": "3.0.0",
+  "time": "2019-05-31",
   "homepage": "http://nymph.io/",
   "type": "library",
   "authors": [
diff --git a/composer.lock b/composer.lock
index 44fe918..40d7df8 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "7c89e289499db37c3c949cf6f3fc7fac",
+    "content-hash": "530203a8aa18910f306168a555aa40bc",
     "packages": [],
     "packages-dev": [
         {
@@ -682,16 +682,16 @@
         },
         {
             "name": "phpunit/phpunit",
-            "version": "7.5.11",
+            "version": "7.5.12",
             "source": {
                 "type": "git",
                 "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "64cb33f5b520da490a7b13149d39b43cf3c890c6"
+                "reference": "9ba59817745b0fe0c1a5a3032dfd4a6d2994ad1c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/64cb33f5b520da490a7b13149d39b43cf3c890c6",
-                "reference": "64cb33f5b520da490a7b13149d39b43cf3c890c6",
+                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/9ba59817745b0fe0c1a5a3032dfd4a6d2994ad1c",
+                "reference": "9ba59817745b0fe0c1a5a3032dfd4a6d2994ad1c",
                 "shasum": ""
             },
             "require": {
@@ -762,7 +762,7 @@
                 "testing",
                 "xunit"
             ],
-            "time": "2019-05-14T04:53:02+00:00"
+            "time": "2019-05-28T11:59:40+00:00"
         },
         {
             "name": "sciactive/hookphp",
diff --git a/src/Nymph.php b/src/Nymph.php
index 4e0f8c0..ef6bcab 100644
--- a/src/Nymph.php
+++ b/src/Nymph.php
@@ -12,7 +12,7 @@
  * @see http://nymph.io/
  */
 class Nymph {
-  const VERSION = '3.0.0-beta.24';
+  const VERSION = '3.0.0';
 
   /**
    * The Nymph config array.
diff --git a/testing/tests/EntityTest.php b/testing/tests/EntityTest.php
index 12df4fc..72d0fef 100644
--- a/testing/tests/EntityTest.php
+++ b/testing/tests/EntityTest.php
@@ -301,7 +301,7 @@ public function testAcceptJSON($arr) {
     $entityDataDelete = json_decode($json, true);
 
     unset($entityDataDelete['data']['string']);
-    $testEntity->jsonAcceptData($entityDataDelete['data']);
+    $testEntity->jsonAcceptData($entityDataDelete);
 
     $this->assertFalse(isset($testEntity->string));
 
@@ -315,7 +315,6 @@ public function testAcceptJSON($arr) {
     $testEntity->cdate = "13";
     $testEntity->mdate = "14.00009";
     $entityData['tags'] = ['test', 'notag', 'newtag'];
-    $testEntity->jsonAcceptTags($entityData['tags']);
     $entityData['data']['name'] = 'bad';
     $entityData['data']['string'] = 'good';
     $entityData['data']['null'] = true;
@@ -324,7 +323,7 @@ public function testAcceptJSON($arr) {
     $entityData['data']['reference'] = false;
     $entityData['data']['refArray'] = [false];
     $entityData['data']['refObject'] = (object) ["thing"=>false];
-    $testEntity->jsonAcceptData($entityData['data']);
+    $testEntity->jsonAcceptData($entityData);
 
     $this->assertFalse($testEntity->hasTag('notag'));
     $this->assertTrue($testEntity->hasTag('newtag'));
@@ -352,8 +351,7 @@ public function testAcceptJSON($arr) {
 
     $testEntity->cdate = "13";
     $testEntity->mdate = "14";
-    $testEntity->jsonAcceptTags($entityData['tags']);
-    $testEntity->jsonAcceptData($entityData['data']);
+    $testEntity->jsonAcceptData($entityData);
 
     $this->assertFalse($testEntity->hasTag('notag'));
     $this->assertTrue($testEntity->hasTag('newtag'));