Merge branch 'master' of github.com:cpriego/valet-linux

Author: cpriego

cli/Valet/Configuration.php

@@ -123,7 +123,7 @@ public function createCertificatesDirectory()
     public function writeBaseConfiguration()
     {
         if (! $this->files->exists($this->path())) {
-            $this->write(['domain' => 'dev', 'paths' => [], 'port' => '80']);
+            $this->write(['domain' => 'test', 'paths' => [], 'port' => '80']);
         }
     }
 

cli/Valet/DnsMasq.php

@@ -125,7 +125,7 @@ private function mergeDns()
      *
      * @return void
      */
-    public function install($domain = 'dev')
+    public function install($domain = 'test')
     {
         $this->dnsmasqSetup();
         $this->fixResolved();

cli/drivers/KirbyValetDriver.php

@@ -42,7 +42,7 @@ public function isStaticFile($sitePath, $siteName, $uri)
      */
     public function frontControllerPath($sitePath, $siteName, $uri)
     {
-        // Needed to force Kirby to use *.dev to generate its URLs...
+        // Needed to force Kirby to use *.test to generate its URLs...
         $_SERVER['SERVER_NAME'] = $_SERVER['HTTP_HOST'];
 
         if (preg_match('/^\/panel/', $uri)) {

cli/drivers/Typo3ValetDriver.php

@@ -139,8 +139,8 @@ public function frontControllerPath($sitePath, $siteName, $uri)
     }
 
     /**
-     * Direct access to installtool via domain.dev/typo3/install/ will be redirected to
-     * sysext install script. domain.dev/typo3 will be redirected to /typo3/, because
+     * Direct access to installtool via domain.test/typo3/install/ will be redirected to
+     * sysext install script. domain.test/typo3 will be redirected to /typo3/, because
      * the generated JavaScript URIs on the login screen would be broken on /typo3.
      *
      * @param string $uri
@@ -173,7 +173,7 @@ private function serveScript($sitePath, $siteName, $uri)
         $docroot = $sitePath . $this->documentRoot;
         $abspath = $docroot . $uri;
 
-        $_SERVER['SERVER_NAME'] = $siteName . '.dev';
+        $_SERVER['SERVER_NAME'] = $siteName . '.test';
         $_SERVER['DOCUMENT_ROOT'] = $docroot;
         $_SERVER['DOCUMENT_URI'] = $uri;
         $_SERVER['SCRIPT_FILENAME'] = $abspath;

readme.md

@@ -12,7 +12,7 @@
 
 Valet *Linux* is a Laravel development environment for Linux minimalists. No Vagrant, no `/etc/hosts` file. You can even share your sites publicly using local tunnels. _Yeah, we like it too._
 
-Valet *Linux* configures your system to always run Nginx in the background when your machine starts. Then, using [DnsMasq](https://en.wikipedia.org/wiki/Dnsmasq), Valet proxies all requests on the `*.dev` domain to point to sites installed on your local machine.
+Valet *Linux* configures your system to always run Nginx in the background when your machine starts. Then, using [DnsMasq](https://en.wikipedia.org/wiki/Dnsmasq), Valet proxies all requests on the `*.test` domain to point to sites installed on your local machine.
 
 In other words, a blazing fast Laravel development environment that uses roughly 7mb of RAM. Valet *Linux* isn't a complete replacement for Vagrant or Homestead, but provides a great alternative if you want flexible basics, prefer extreme speed, or are working on a machine with a limited amount of RAM.
 

tests/Functional/InstallTest.php

@@ -9,7 +9,7 @@ class InstallTest extends FunctionalTestCase
 {
     public function test_valet_is_running_after_install()
     {
-        $response = \Httpful\Request::get('http://test.dev')->send();
+        $response = \Httpful\Request::get('http://test.test')->send();
 
         $this->assertEquals(404, $response->code);
         $this->assertContains('Valet - Not Found', $response->body);

tests/Functional/LinkTest.php

@@ -25,7 +25,7 @@ public function test_valet_site_is_linked()
         // Call valet link command
         $this->valetCommand('link linked', $_SERVER['HOME'] . '/linked-directory');
 
-        $response = \Httpful\Request::get('http://linked.dev')->send();
+        $response = \Httpful\Request::get('http://linked.test')->send();
 
         $this->assertEquals(200, $response->code);
         $this->assertContains('Valet linked site', $response->body);
@@ -39,7 +39,7 @@ public function test_valet_site_is_unlinked()
         // Call valet unlink command
         $this->valetCommand('unlink linked', $_SERVER['HOME'] . '/linked-directory');
 
-        $response = \Httpful\Request::get('http://linked.dev')->send();
+        $response = \Httpful\Request::get('http://linked.test')->send();
 
         $this->assertEquals(404, $response->code);
         $this->assertContains('Valet - Not Found', $response->body);
@@ -53,7 +53,7 @@ public function test_valet_links()
         $response = $this->valetCommand('links');
 
         $this->assertContains('linked', $response);
-        $this->assertContains('http://linked.dev', $response);
+        $this->assertContains('http://linked.test', $response);
         $this->assertContains($_SERVER['HOME'] . '/linked-directory', $response);
         // TODO: Test SSL output
     }

tests/Functional/ParkTest.php

@@ -35,15 +35,15 @@ public function test_valet_can_be_parked()
     {
         $this->valetCommand('park', $_SERVER['HOME'] . '/Code');
 
-        $one = \Httpful\Request::get('http://one.dev')->send();
+        $one = \Httpful\Request::get('http://one.test')->send();
         $this->assertEquals(200, $one->code);
         $this->assertContains('One', $one->body);
 
-        $two = \Httpful\Request::get('http://two.dev')->send();
+        $two = \Httpful\Request::get('http://two.test')->send();
         $this->assertEquals(200, $two->code);
         $this->assertContains('Two', $two->body);
 
-        $spaces = \Httpful\Request::get('http://with-spaces.dev')->send();
+        $spaces = \Httpful\Request::get('http://with-spaces.test')->send();
         $this->assertEquals(200, $spaces->code);
         $this->assertContains('With Spaces', $spaces->body);
     }
@@ -54,7 +54,7 @@ public function test_valet_can_forget_directory()
 
         $this->valetCommand('forget', $_SERVER['HOME'] . '/Code');
 
-        $response = \Httpful\Request::get('http://one.dev')->send();
+        $response = \Httpful\Request::get('http://one.test')->send();
 
         $this->assertEquals(404, $response->code);
         $this->assertContains('Valet - Not Found', $response->body);

tests/Functional/SecureTest.php

@@ -28,7 +28,7 @@ public function test_valet_can_enable_https()
     {
         $this->valetCommand('secure', $_SERVER['HOME'] . '/valet-site');
 
-        $response = \Httpful\Request::get('https://valet-site.dev')->send();
+        $response = \Httpful\Request::get('https://valet-site.test')->send();
 
         $this->assertEquals(200, $response->code);
         $this->assertContains('Valet site', $response->body);
@@ -40,6 +40,6 @@ public function test_valet_can_disable_https()
 
         $this->valetCommand('unsecure', $_SERVER['HOME'] . '/valet-site');
 
-        \Httpful\Request::get('https://valet-site.dev')->send();
+        \Httpful\Request::get('https://valet-site.test')->send();
     }
 }

tests/Integration/DnsMasqTest.php

@@ -37,7 +37,7 @@ public function test_install_calls_the_right_methods_and_restarts()
         $dnsMasq = Mockery::mock(DnsMasq::class.'[dnsmasqSetup,createCustomConfigFile,fixResolved]', [$pm, $sm, $files, $cli]);
 
         $dnsMasq->shouldReceive('dnsmasqSetup')->once();
-        $dnsMasq->shouldReceive('createCustomConfigFile')->once()->with('dev');
+        $dnsMasq->shouldReceive('createCustomConfigFile')->once()->with('test');
         $dnsMasq->shouldReceive('fixResolved')->once();
         $pm->shouldReceive('nmRestart')->once()->with($sm);
         $sm->shouldReceive('restart')->once()->with('dnsmasq');