Merge branch 'develop' of https://github.com/FACT-Finder/FACT-Finder-PHP-Framework into develop
Merge branch 'master' of https://github.com/FACT-Finder/FACT-Finder-PHP-Framework
Merge branch 'master' into develop
Merge branch 'develop' of https://github.com/FACT-Finder/FACT-Finder-PHP-Framework into develop
Added tests (and some saved responses) for JSON API (starting with FF 6.6).
Added corresponding Import, Recommendation, Suggest and TagCloud adapters.
Adjusted DummyProvider to accept a file extension (".xml" is default).
Added RefKey to SuggestQueries.
Removed lazy loading from Adapter base class as the loading operation is only an assignment here - lazy loading therefore relies on the data providers. This is necessary for data reloads after changing parameters.
Ported test for FF 6.6 JsonSearchAdapter from .NET and started implementing corresponding SearchAdapter (only Campaigns and ASN are missing).
Finished JSON-SearchAdapter for FF 6.6.
Added JSON-SearchAdapter for FF 6.7 (including advisor campaigns)
Added JSON-SearchAdapter for FF 6.8
Added JSON-SearchAdapter for FF 6.9
Added JSON-CompareAdapter for all versions.
Added JSON-SimilarRecordsAdapter for all versions.
Added JSON-ProductCampaignAdapter for FF 6.7.
Added JSON-ProductCampaignAdapter for FF 6.8 and FF 6.9.
JSON-SearchAdapters now return error and stacktrace data if available.
Added another demo shop that uses the JSON API.
Resolved PHP errors in TrackingAdapter
(cherry picked from commit e4cc8d0c224026ba4e3767a7ee27590ff6961e2a)
Moved TrackingAdapter implementation to Http folder, as there is no XML-parsing going on.
The Xml69/TrackingAdapter remains for now though, so as not to introduce any breaking API changes.
Merge branch 'json' into develop
Integrate revamped tracking