From b4cc6f931f8f9ee7c6b4c22059983a2bcbcbb097 Mon Sep 17 00:00:00 2001
From: Markus Kalkbrenner <markus.kalkbrenner@bio.logis.de>
Date: Fri, 26 Jan 2018 10:08:58 +0100
Subject: [PATCH] remove deprecated classes for 4.0.0 (#568)

* remove obsolete Autoloader implementation

* marked range query injection prevention as security fix

* added all integration tests to group "integration"

* removed deprecated classes. fixes #564

* remove hhvm tests on travis, use Solr 7.2.1
---
 .travis.yml                            | 10 ++--------
 CHANGELOG.md                           |  9 +++++++++
 src/Core/Plugin/Plugin.php             | 12 ------------
 src/Core/Query/Query.php               | 12 ------------
 src/Core/Query/RequestBuilder.php      | 12 ------------
 src/Core/Query/ResponseParser.php      | 12 ------------
 src/QueryType/Analysis/Query/Query.php | 12 ------------
 7 files changed, 11 insertions(+), 68 deletions(-)
 delete mode 100644 src/Core/Plugin/Plugin.php
 delete mode 100644 src/Core/Query/Query.php
 delete mode 100644 src/Core/Query/RequestBuilder.php
 delete mode 100644 src/Core/Query/ResponseParser.php
 delete mode 100644 src/QueryType/Analysis/Query/Query.php

diff --git a/.travis.yml b/.travis.yml
index 96ab53844..1e23e4e03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,15 +6,13 @@ php:
   - 7.2
   - 7.1
   - 7.0
-  # hhvm removed as it is not fully compatible with php7
-  # - hhvm
   - nightly
 
 env:
   - SYMFONY_VERSION=2.8.* SOLR_VERSION=6.6.2
   - SYMFONY_VERSION=3.0.* SOLR_VERSION=6.6.2
   - SYMFONY_VERSION=4.0.* SOLR_VERSION=6.6.2
-  - SYMFONY_VERSION=4.0.* SOLR_VERSION=7.2.0
+  - SYMFONY_VERSION=4.0.* SOLR_VERSION=7.2.1
 
 cache:
   directories:
@@ -41,11 +39,7 @@ matrix:
       - php: 7.0
         env: SYMFONY_VERSION=4.0.* SOLR_VERSION=6.6.2
       - php: 7.0
-        env: SYMFONY_VERSION=4.0.* SOLR_VERSION=7.2.0
-      - php: hhvm
-        env: SYMFONY_VERSION=4.0.* SOLR_VERSION=6.6.2
-      - php: hhvm
-        env: SYMFONY_VERSION=4.0.* SOLR_VERSION=7.2.0
+        env: SYMFONY_VERSION=4.0.* SOLR_VERSION=7.2.1
   allow_failures:
       - php: nightly
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26e72b430..aa03e1cab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -29,6 +29,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 - Phar support
 - Exclude test suite from distribution
 - Dropped support for Solr versions before 6
+- Obsolete Autoloader.php
+- Deprecated Solarium\Core\Plugin\Plugin in favor of Solarium\Core\Plugin\AbstractPlugin
+- Deprecated Solarium\Core\Query\Query in favor of Solarium\Core\Query\AbstractQuery
+- Deprecated Solarium\Core\Query\RequestBuilder in favor of Solarium\Core\Query\AbstractRequestBuilder
+- Deprecated Solarium\Core\Query\ResponseParser in favor of Solarium\Core\Query\AbstractResponseParser
+- Deprecated Solarium\QueryType\Analysis\Query\Query in favor of Solarium\QueryType\Analysis\Query\AbstractQuery
+
+### Security
+- Prevented query injection inside range queries
 
 ### Security
 - Prevented query injection inside range queries
diff --git a/src/Core/Plugin/Plugin.php b/src/Core/Plugin/Plugin.php
deleted file mode 100644
index b6758bca0..000000000
--- a/src/Core/Plugin/Plugin.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Solarium\Core\Plugin;
-
-/**
- * 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/src/Core/Query/Query.php b/src/Core/Query/Query.php
deleted file mode 100644
index 0ff3594a0..000000000
--- a/src/Core/Query/Query.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Solarium\Core\Query;
-
-/**
- * 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/src/Core/Query/RequestBuilder.php b/src/Core/Query/RequestBuilder.php
deleted file mode 100644
index 91d6a991d..000000000
--- a/src/Core/Query/RequestBuilder.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Solarium\Core\Query;
-
-/**
- * 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/src/Core/Query/ResponseParser.php b/src/Core/Query/ResponseParser.php
deleted file mode 100644
index 1160014d7..000000000
--- a/src/Core/Query/ResponseParser.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Solarium\Core\Query;
-
-/**
- * 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/src/QueryType/Analysis/Query/Query.php b/src/QueryType/Analysis/Query/Query.php
deleted file mode 100644
index f5589171b..000000000
--- a/src/QueryType/Analysis/Query/Query.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-namespace Solarium\QueryType\Analysis\Query;
-
-/**
- * This class is for backwards compatibility, will be removed in 4.x releases in favor of AbstractQuery.
- *
- * @deprecated
- */
-abstract class Query extends AbstractQuery
-{
-}