From c96bef665ebed3d6d5c2ce98f93aa96fb28cd937 Mon Sep 17 00:00:00 2001
From: Charley DAVID <Calyhre@users.noreply.github.com>
Date: Mon, 10 Apr 2017 21:01:42 -0300
Subject: [PATCH] [4.x] Fix deprecation warnings for react >= 15.5.0 (#666)

* Handle React.PropTypes deprecations

* Handle React.createClass deprecation

* Handle react-addons-test-utils deprecations
---
 package.json                     |  9 +++++----
 src/components/Provider.js       |  3 ++-
 src/utils/storeShape.js          |  2 +-
 test/components/Provider.spec.js |  9 +++++----
 test/components/connect.spec.js  | 14 ++++++++------
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/package.json b/package.json
index 22469ea24..406be085b 100644
--- a/package.json
+++ b/package.json
@@ -81,18 +81,19 @@
     "istanbul": "^0.3.17",
     "jsdom": "~5.4.3",
     "mocha": "^2.2.5",
-    "react": "^0.14.0",
-    "react-addons-test-utils": "^0.14.0",
-    "react-dom": "^0.14.0",
+    "react": "^15.5.0",
+    "react-dom": "^15.5.0",
     "redux": "^3.0.0",
     "rimraf": "^2.3.4",
     "webpack": "^1.11.0"
   },
   "dependencies": {
+    "create-react-class": "^15.5.1",
     "hoist-non-react-statics": "^1.0.3",
     "invariant": "^2.0.0",
     "lodash": "^4.2.0",
-    "loose-envify": "^1.1.0"
+    "loose-envify": "^1.1.0",
+    "prop-types": "^15.5.4"
   },
   "peerDependencies": {
     "react": "^0.14.0 || ^15.0.0-0 || ^15.4.0-0 || ^16.0.0-0",
diff --git a/src/components/Provider.js b/src/components/Provider.js
index 7c9ba926d..87bb2d0d8 100644
--- a/src/components/Provider.js
+++ b/src/components/Provider.js
@@ -1,4 +1,5 @@
-import { Component, PropTypes, Children } from 'react'
+import { Component, Children } from 'react'
+import PropTypes from 'prop-types'
 import storeShape from '../utils/storeShape'
 import warning from '../utils/warning'
 
diff --git a/src/utils/storeShape.js b/src/utils/storeShape.js
index 16b1b141a..15490db7b 100644
--- a/src/utils/storeShape.js
+++ b/src/utils/storeShape.js
@@ -1,4 +1,4 @@
-import { PropTypes } from 'react'
+import PropTypes from 'prop-types'
 
 export default PropTypes.shape({
   subscribe: PropTypes.func.isRequired,
diff --git a/test/components/Provider.spec.js b/test/components/Provider.spec.js
index affbf81e7..53edd66d9 100644
--- a/test/components/Provider.spec.js
+++ b/test/components/Provider.spec.js
@@ -1,6 +1,7 @@
 import expect from 'expect'
-import React, { PropTypes, Component } from 'react'
-import TestUtils from 'react-addons-test-utils'
+import React, { Component } from 'react'
+import PropTypes from 'prop-types'
+import TestUtils from 'react-dom/test-utils'
 import { createStore } from 'redux'
 import { Provider } from '../../src/index'
 
@@ -34,14 +35,14 @@ describe('React', () => {
         expect(() => TestUtils.renderIntoDocument(
           <Provider store={store}>
           </Provider>
-        )).toThrow(/exactly one child/)
+        )).toThrow(/a single React element/)
 
         expect(() => TestUtils.renderIntoDocument(
           <Provider store={store}>
             <div />
             <div />
           </Provider>
-        )).toThrow(/exactly one child/)
+        )).toThrow(/a single React element/)
       } finally {
         Provider.propTypes = propTypes
       }
diff --git a/test/components/connect.spec.js b/test/components/connect.spec.js
index 514eea018..8f3d364ac 100644
--- a/test/components/connect.spec.js
+++ b/test/components/connect.spec.js
@@ -1,7 +1,9 @@
 import expect from 'expect'
-import React, { createClass, Children, PropTypes, Component } from 'react'
+import React, { Children, Component } from 'react'
+import createClass from 'create-react-class'
+import PropTypes from 'prop-types'
 import ReactDOM from 'react-dom'
-import TestUtils from 'react-addons-test-utils'
+import TestUtils from 'react-dom/test-utils'
 import { createStore } from 'redux'
 import { connect } from '../../src/index'
 
@@ -9,7 +11,7 @@ describe('React', () => {
   describe('connect', () => {
     class Passthrough extends Component {
       render() {
-        return <div {...this.props} />
+        return <div />
       }
     }
 
@@ -1381,7 +1383,7 @@ describe('React', () => {
       }
 
       ImpureComponent.contextTypes = {
-        statefulValue: React.PropTypes.number
+        statefulValue: PropTypes.number
       }
 
       const decorator = connect(state => state, null, null, { pure: false })
@@ -1405,7 +1407,7 @@ describe('React', () => {
       }
 
       StatefulWrapper.childContextTypes = {
-        statefulValue: React.PropTypes.number
+        statefulValue: PropTypes.number
       }
 
       const tree = TestUtils.renderIntoDocument(
@@ -1727,7 +1729,7 @@ describe('React', () => {
           updatedCount++
         }
         render() {
-          return <div {...this.props} />
+          return <div />
         }
       }