Merge pull request #6 from sminnee/ss4-support

SS4 support with segment-field 2.0

Author: assertchris

.travis.yml

@@ -1,14 +1,12 @@
 language: php
 
 php:
-    - 5.3
-    - 5.4
     - 5.5
     - 5.6
     - 7.0
 
 env:
-    - DB=MYSQL CORE_RELEASE=3.1
+    - DB=MYSQL CORE_RELEASE=master
 
 before_script:
     - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support

code/Filter/SlugFilter.php

@@ -3,7 +3,9 @@
 namespace SilverStripe\Forms\Filter;
 
 use SilverStripe\Forms\Filter;
-use URLSegmentFilter;
+
+use SilverStripe\View\Parsers\URLSegmentFilter;
+
 
 class SlugFilter extends URLSegmentFilter implements Filter {
 	/**

code/SegmentField.php

@@ -2,8 +2,11 @@
 
 namespace SilverStripe\Forms;
 
-use Requirements;
-use TextField;
+
+
+use SilverStripe\View\Requirements;
+use SilverStripe\Forms\TextField;
+
 
 class SegmentField extends TextField {
 	/**
@@ -72,7 +75,7 @@ public function Preview() {
 	 * @return string
 	 */
 	public function Field($properties = array()) {
-		Requirements::javascript(THIRDPARTY_DIR . '/jquery/jquery.js');
+		Requirements::javascript('http://code.jquery.com/jquery-1.7.2.min.js');
 		Requirements::javascript(SEGMENT_FIELD_DIR . '/public/segment-field.dist.js');
 		Requirements::css(SEGMENT_FIELD_DIR . '/public/segment-field.css');
 

code/SegmentFieldModifier/IDSegmentFieldModifier.php

@@ -2,7 +2,9 @@
 
 namespace SilverStripe\Forms\SegmentFieldModifier;
 
-use Form;
+
+use SilverStripe\Forms\Form;
+
 
 class IDSegmentFieldModifier extends AbstractSegmentFieldModifier {
 	/**

code/SegmentFieldModifier/SlugSegmentFieldModifier.php

@@ -3,7 +3,9 @@
 namespace SilverStripe\Forms\SegmentFieldModifier;
 
 use SilverStripe\Forms\Filter\SlugFilter;
-use SS_HTTPRequest;
+
+use SilverStripe\Control\HTTPRequest;
+
 
 class SlugSegmentFieldModifier extends AbstractSegmentFieldModifier {
 	/**
@@ -52,7 +54,7 @@ public function getSuggestion($value) {
 	 * @return string
 	 */
 	protected function getValue() {
-		if($this->request instanceof SS_HTTPRequest && $value = $this->request->getVar('value')) {
+		if($this->request instanceof HTTPRequest && $value = $this->request->getVar('value')) {
 			return $value;
 		}
 

composer.json

@@ -5,12 +5,19 @@
 	"keywords": ["silverstripe", "segment"],
 	"license": "MIT",
 	"require": {
-		"silverstripe/framework": "^3.1",
-		"silverstripe/cms": "^3.1"
+		"silverstripe/framework": "^4.0@dev",
+		"silverstripe/cms": "^4.0@dev"
 	},
 	"require-dev": {
 		"phpunit/phpunit": "^3.7",
-		"mockery/mockery": "^0.9"
+		"mockery/mockery": "^0.9",
+		"silverstripe/reports": "^4.0@dev",
+		"silverstripe/siteconfig": "^4.0@dev"
+	},
+	"extra": {
+		"branch-alias": {
+			"dev-master": "2.0.x-dev"
+		}
 	},
 	"autoload": {
 		"psr-4": {

tests/SegmentFieldModifier/IDSegmentFieldModifierTest.php

@@ -2,11 +2,13 @@
 
 namespace SilverStripe\Forms\Tests;
 
-use Form;
+
 use Mockery;
-use SapphireTest;
+
 use SilverStripe\Forms\SegmentFieldModifier\IDSegmentFieldModifier;
 use stdClass;
+use SilverStripe\Dev\SapphireTest;
+
 
 /**
  * @cover IDSegmentFieldModifier
@@ -42,7 +44,7 @@ protected function getNewFormMock() {
 		$record = new StdClass();
 		$record->ID = 123;
 
-		$mock = Mockery::mock('Form');
+		$mock = Mockery::mock('SilverStripe\\Forms\\Form');
 		$mock->shouldReceive('getRecord')->andReturn($record);
 
 		return $mock;

tests/SegmentFieldModifier/SlugSegmentFieldModifierTest.php

@@ -2,10 +2,12 @@
 
 namespace SilverStripe\Forms\Tests;
 
-use Form;
+
 use Mockery;
-use SapphireTest;
+
 use SilverStripe\Forms\SegmentFieldModifier\SlugSegmentFieldModifier;
+use SilverStripe\Dev\SapphireTest;
+
 
 /**
  * @cover SlugSegmentFieldModifier
@@ -41,7 +43,7 @@ public function testGetPreview() {
 	 * @return Form
 	 */
 	protected function getNewRequestMock() {
-		$mock = Mockery::mock('SS_HTTPRequest');
+		$mock = Mockery::mock('SilverStripe\\Control\\HTTPRequest');
 		$mock->shouldReceive('getVar')->with('value')->andReturn('This is a LONG value!');
 
 		return $mock;

tests/SegmentFieldTest.php

@@ -2,12 +2,14 @@
 
 namespace SilverStripe\Forms\Tests;
 
-use Form;
+
 use Mockery;
-use SapphireTest;
+
 use SilverStripe\Forms\SegmentField;
 use SilverStripe\Forms\SegmentFieldModifier\AbstractSegmentFieldModifier;
-use SS_HTTPRequest;
+
+use SilverStripe\Dev\SapphireTest;
+
 
 /**
  * @cover SegmentField
@@ -74,14 +76,14 @@ public function testGettersAndSetters()
 	 * @return SS_HTTPRequest
 	 */
 	protected function getNewRequestMock() {
-		return Mockery::mock('SS_HTTPRequest');
+		return Mockery::mock('SilverStripe\\Control\\HTTPRequest');
 	}
 
 	/**
 	 * @return Form
 	 */
 	protected function getNewFormMock() {
-		return Mockery::mock('Form');
+		return Mockery::mock('SilverStripe\\Forms\\Form');
 	}
 }