Cleanup example bootstrapping

examples/001_connect.php → examples/1-connect.php

@@ -4,7 +4,7 @@
  * Generic example for establishing a connection
  */
 
-require './example_bootstrap.php';
+require 'support/bootstrap.php';
 
 \Amp\Loop::run(function() {
     /* If you want ssl, pass as second argument an array with ssl options (an empty options array is valid too); if null is passed, ssl is not enabled either */

examples/002_simple_query.php → examples/2-simple-query.php

@@ -1,6 +1,6 @@
 <?php
 
-require './example_bootstrap.php';
+require 'support/bootstrap.php';
 
 \Amp\Loop::run(function() {
     $db = new \Amp\Mysql\Pool("host=".DB_HOST.";user=".DB_USER.";pass=".DB_PASS.";db=".DB_NAME);

examples/003_generic_with_yield.php → examples/3-generic-with-yield.php

@@ -1,6 +1,6 @@
 <?php
 
-require './example_bootstrap.php';
+require 'support/bootstrap.php';
 
 \Amp\Loop::run(function() {
     $db = new \Amp\Mysql\Pool("host=".DB_HOST.";user=".DB_USER.";pass=".DB_PASS.";db=".DB_NAME);
@@ -15,7 +15,7 @@
     }
 
     /* wait until everything is inserted (in case where we wouldn't have to wait, we also could just  */
-    yield \Amp\Promise\all($promises);
+    yield $promises;
 
     print "Insertion successful (if it wasn't, an exception would have been thrown by now)\n";
 

examples/004_multi_rows.php → examples/4-multi-rows.php

@@ -1,13 +1,13 @@
 <?php
 
-require './example_bootstrap.php';
-require 'support/generic_table.php';
+require 'support/bootstrap.php';
+require 'support/generic-table.php';
 
 \Amp\Loop::run(function() {
     $db = new \Amp\Mysql\Pool("host=".DB_HOST.";user=".DB_USER.";pass=".DB_PASS.";db=".DB_NAME);
 
-    /* create same table than in 003_generic_with_yield.php */
-    yield new \Amp\Coroutine(genTable($db));
+    /* create same table than in 3-generic-with-yield.php */
+    yield from createGenericTable($db);
 
     /* yeah, we need a lot of yields and assigns here... With PHP 7 we finally can drop a lot of stupid parenthesis! */
     $query = (yield $db->query("SELECT a * b FROM tmp"));

examples/005_multi_stmts.php → examples/5-multi-stmts.php

@@ -1,13 +1,13 @@
 <?php
 
-require './example_bootstrap.php';
-require 'support/generic_table.php';
+require 'support/bootstrap.php';
+require 'support/generic-table.php';
 
 \Amp\Loop::run(function() {
     $db = new \Amp\Mysql\Pool("host=".DB_HOST.";user=".DB_USER.";pass=".DB_PASS.";db=".DB_NAME);
 
-    /* create same table than in 003_generic_with_yield.php */
-    yield new \Amp\Coroutine(genTable($db));
+    /* create same table than in 3-generic-with-yield.php */
+    yield from createGenericTable($db);
 
     /* multi statements are enabled by default, but generally stored procedures also might return multiple resultsets anyway */
     $promise = $db->query("SELECT a + b FROM tmp; SELECT a - b FROM tmp;");

examples/support/bootstrap.php

@@ -0,0 +1,13 @@
+<?php
+
+require __DIR__ . '/../../vendor/autoload.php';
+
+/*
+ * This file is not in VCS - create it if you want to set
+ * the DB credentials without having them commited to VCS.
+ */
+@include_once __DIR__ . "/../../mysql-config.php";
+
+if (!defined('DB_HOST') || !defined('DB_USER') || !defined('DB_PASS') || !defined('DB_NAME')) {
+    throw new \Exception("Must create mysql-config.php in project root directory defining connection constants");
+}

examples/support/generic_table.php → examples/support/generic-table.php

@@ -1,11 +1,11 @@
 <?php
 
 /* Create table and fill in a few rows for examples; for comments see 003_generic_with_yield.php */
-function genTable(\Amp\Mysql\Pool $db) {
+function createGenericTable(\Amp\Mysql\Pool $db): Generator {
     yield $db->query("CREATE TABLE tmp SELECT 1 AS a, 2 AS b");
     $promises = [];
     foreach (range(1, 5) as $num) {
         $promises[] = $db->query("INSERT INTO tmp (a, b) VALUES ($num, $num * 2)");
     }
-    yield \Amp\Promise\all($promises);
+    return yield $promises;
 }