From c3de7b4562e99439d007be8eb8951efdd222c0eb Mon Sep 17 00:00:00 2001
From: Bas de Nooijer <github@raspberry.nl>
Date: Sat, 19 Dec 2015 08:21:05 +0100
Subject: [PATCH 1/2] Fix BC break in 3.5.0 release

---
 library/Solarium/Core/Plugin/Plugin.php       | 44 +++++++++++++++++
 library/Solarium/Core/Query/Query.php         | 48 +++++++++++++++++++
 .../Solarium/Core/Query/RequestBuilder.php    | 48 +++++++++++++++++++
 .../Solarium/Core/Query/ResponseParser.php    | 48 +++++++++++++++++++
 .../QueryType/Analysis/Query/Query.php        | 48 +++++++++++++++++++
 5 files changed, 236 insertions(+)
 create mode 100644 library/Solarium/Core/Plugin/Plugin.php
 create mode 100644 library/Solarium/Core/Query/Query.php
 create mode 100644 library/Solarium/Core/Query/RequestBuilder.php
 create mode 100644 library/Solarium/Core/Query/ResponseParser.php
 create mode 100644 library/Solarium/QueryType/Analysis/Query/Query.php

diff --git a/library/Solarium/Core/Plugin/Plugin.php b/library/Solarium/Core/Plugin/Plugin.php
new file mode 100644
index 000000000..a1c18d0a8
--- /dev/null
+++ b/library/Solarium/Core/Plugin/Plugin.php
@@ -0,0 +1,44 @@
+<?php
+/**
+ * Copyright 2015 Bas de Nooijer. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this listof conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are
+ * those of the authors and should not be interpreted as representing official
+ * policies, either expressed or implied, of the copyright holder.
+ *
+ * @copyright Copyright 2015 Bas de Nooijer <solarium@raspberry.nl>
+ * @license http://github.com/basdenooijer/solarium/raw/master/COPYING
+ *
+ * @link http://www.solarium-project.org/
+ */
+
+namespace Solarium\Core\Plugin;
+
+/**
+ * This class is for backwards compatibility, will be removed in 4.x releases
+ */
+abstract class Plugin extends AbstractPlugin
+{
+}
diff --git a/library/Solarium/Core/Query/Query.php b/library/Solarium/Core/Query/Query.php
new file mode 100644
index 000000000..5d01db771
--- /dev/null
+++ b/library/Solarium/Core/Query/Query.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright 2015 Bas de Nooijer. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this listof conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are
+ * those of the authors and should not be interpreted as representing official
+ * policies, either expressed or implied, of the copyright holder.
+ *
+ * @copyright Copyright 2015 Bas de Nooijer <solarium@raspberry.nl>
+ * @license http://github.com/basdenooijer/solarium/raw/master/COPYING
+ *
+ * @link http://www.solarium-project.org/
+ */
+
+/**
+ * @namespace
+ */
+
+namespace Solarium\Core\Query;
+
+/**
+ * This class is for backwards compatibility, will be removed in 4.x releases
+ */
+abstract class Query extends AbstractQuery
+{
+}
diff --git a/library/Solarium/Core/Query/RequestBuilder.php b/library/Solarium/Core/Query/RequestBuilder.php
new file mode 100644
index 000000000..8c21a48fd
--- /dev/null
+++ b/library/Solarium/Core/Query/RequestBuilder.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright 2015 Bas de Nooijer. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this listof conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are
+ * those of the authors and should not be interpreted as representing official
+ * policies, either expressed or implied, of the copyright holder.
+ *
+ * @copyright Copyright 2015 Bas de Nooijer <solarium@raspberry.nl>
+ * @license http://github.com/basdenooijer/solarium/raw/master/COPYING
+ *
+ * @link http://www.solarium-project.org/
+ */
+
+/**
+ * @namespace
+ */
+
+namespace Solarium\Core\Query;
+
+/**
+ * This class is for backwards compatibility, will be removed in 4.x releases
+ */
+abstract class RequestBuilder extends AbstractRequestBuilder
+{
+}
diff --git a/library/Solarium/Core/Query/ResponseParser.php b/library/Solarium/Core/Query/ResponseParser.php
new file mode 100644
index 000000000..9948248cc
--- /dev/null
+++ b/library/Solarium/Core/Query/ResponseParser.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright 2015 Bas de Nooijer. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this listof conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are
+ * those of the authors and should not be interpreted as representing official
+ * policies, either expressed or implied, of the copyright holder.
+ *
+ * @copyright Copyright 2015 Bas de Nooijer <solarium@raspberry.nl>
+ * @license http://github.com/basdenooijer/solarium/raw/master/COPYING
+ *
+ * @link http://www.solarium-project.org/
+ */
+
+/**
+ * @namespace
+ */
+
+namespace Solarium\Core\Query;
+
+/**
+ * This class is for backwards compatibility, will be removed in 4.x releases
+ */
+abstract class ResponseParser extends AbstractResponseParser
+{
+}
diff --git a/library/Solarium/QueryType/Analysis/Query/Query.php b/library/Solarium/QueryType/Analysis/Query/Query.php
new file mode 100644
index 000000000..622489285
--- /dev/null
+++ b/library/Solarium/QueryType/Analysis/Query/Query.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Copyright 2015 Bas de Nooijer. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this listof conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
+ * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ * POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are
+ * those of the authors and should not be interpreted as representing official
+ * policies, either expressed or implied, of the copyright holder.
+ *
+ * @copyright Copyright 2015 Bas de Nooijer <solarium@raspberry.nl>
+ * @license http://github.com/basdenooijer/solarium/raw/master/COPYING
+ *
+ * @link http://www.solarium-project.org/
+ */
+
+/**
+ * @namespace
+ */
+
+namespace Solarium\QueryType\Analysis\Query;
+
+/**
+ * This class is for backwards compatibility, will be removed in 4.x releases
+ */
+abstract class Query extends AbstractQuery
+{
+}

From 01b4985198fed47d649e0fd0a8c1a24399a4ab3c Mon Sep 17 00:00:00 2001
From: Bas de Nooijer <github@raspberry.nl>
Date: Sat, 19 Dec 2015 16:59:27 +0100
Subject: [PATCH 2/2] Mark classes as deprecated

---
 library/Solarium/Core/Plugin/Plugin.php             | 4 +++-
 library/Solarium/Core/Query/Query.php               | 4 +++-
 library/Solarium/Core/Query/RequestBuilder.php      | 4 +++-
 library/Solarium/Core/Query/ResponseParser.php      | 4 +++-
 library/Solarium/QueryType/Analysis/Query/Query.php | 4 +++-
 5 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/library/Solarium/Core/Plugin/Plugin.php b/library/Solarium/Core/Plugin/Plugin.php
index a1c18d0a8..3ff7e9cde 100644
--- a/library/Solarium/Core/Plugin/Plugin.php
+++ b/library/Solarium/Core/Plugin/Plugin.php
@@ -37,7 +37,9 @@
 namespace Solarium\Core\Plugin;
 
 /**
- * This class is for backwards compatibility, will be removed in 4.x releases
+ * This class is for backwards compatibility, will be removed in 4.x releases in favor of AbstractPlugin
+ *
+ * @deprecated
  */
 abstract class Plugin extends AbstractPlugin
 {
diff --git a/library/Solarium/Core/Query/Query.php b/library/Solarium/Core/Query/Query.php
index 5d01db771..007086ef5 100644
--- a/library/Solarium/Core/Query/Query.php
+++ b/library/Solarium/Core/Query/Query.php
@@ -41,7 +41,9 @@
 namespace Solarium\Core\Query;
 
 /**
- * This class is for backwards compatibility, will be removed in 4.x releases
+ * This class is for backwards compatibility, will be removed in 4.x releases in favor of AbstractQuery
+ *
+ * @deprecated
  */
 abstract class Query extends AbstractQuery
 {
diff --git a/library/Solarium/Core/Query/RequestBuilder.php b/library/Solarium/Core/Query/RequestBuilder.php
index 8c21a48fd..671be27dc 100644
--- a/library/Solarium/Core/Query/RequestBuilder.php
+++ b/library/Solarium/Core/Query/RequestBuilder.php
@@ -41,7 +41,9 @@
 namespace Solarium\Core\Query;
 
 /**
- * This class is for backwards compatibility, will be removed in 4.x releases
+ * This class is for backwards compatibility, will be removed in 4.x releases in favor of AbstractRequestBuilder
+ *
+ * @deprecated
  */
 abstract class RequestBuilder extends AbstractRequestBuilder
 {
diff --git a/library/Solarium/Core/Query/ResponseParser.php b/library/Solarium/Core/Query/ResponseParser.php
index 9948248cc..2ee30612b 100644
--- a/library/Solarium/Core/Query/ResponseParser.php
+++ b/library/Solarium/Core/Query/ResponseParser.php
@@ -41,7 +41,9 @@
 namespace Solarium\Core\Query;
 
 /**
- * This class is for backwards compatibility, will be removed in 4.x releases
+ * This class is for backwards compatibility, will be removed in 4.x releases in favor of AbstractResponseParser
+ *
+ * @deprecated
  */
 abstract class ResponseParser extends AbstractResponseParser
 {
diff --git a/library/Solarium/QueryType/Analysis/Query/Query.php b/library/Solarium/QueryType/Analysis/Query/Query.php
index 622489285..2fe911562 100644
--- a/library/Solarium/QueryType/Analysis/Query/Query.php
+++ b/library/Solarium/QueryType/Analysis/Query/Query.php
@@ -41,7 +41,9 @@
 namespace Solarium\QueryType\Analysis\Query;
 
 /**
- * This class is for backwards compatibility, will be removed in 4.x releases
+ * This class is for backwards compatibility, will be removed in 4.x releases in favor of AbstractQuery
+ *
+ * @deprecated
  */
 abstract class Query extends AbstractQuery
 {