Adding composer.json, phpunit, and test cases

Author: coreydaley

.gitignore

@@ -28,3 +28,4 @@
 Icon?
 ehthumbs.db
 Thumbs.db
+app/Vendor/*

README.md

@@ -101,5 +101,15 @@ To change your source code in the running container you need to [oc rsh](https:/
 
 After you [oc rsh](https://docs.openshift.org/latest/cli_reference/basic_cli_operations.html#troubleshooting-and-debugging-cli-operations) into the running container, your current directory is set to `/opt/app-root/src`, where the source code is located.
 
+###Source repository layout
+
+You do not need to change anything in your existing PHP project's repository.
+However, if these files exist they will affect the behavior of the build process:
+
+* **composer.json**
+
+  List of dependencies to be installed with `composer`. The format is documented
+  [here](https://getcomposer.org/doc/04-schema.md).
+
 ###License
 This code is dedicated to the public domain to the maximum extent permitted by applicable law, pursuant to [CC0](http://creativecommons.org/publicdomain/zero/1.0/).

app/Config/core.php

@@ -31,29 +31,31 @@
 );
 
 // This function gets called by openshift_secure and passes an array
-function make_secure_key($args) {
-  $hash = $args['hash'];
-  $key  = $args['variable'];
-  $original = $args['original'];
-
-  $chars = '0123456789';
-  if ($key != 'Security.cipherSeed') {
-    $chars .= 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
-    $chars .= '!@#$%^&*()';
-    $chars .= '-_ []{}<>~`+=,.;:/?|';
+if (!function_exists('make_secure_key')) {
+  function make_secure_key($args) {
+    $hash = $args['hash'];
+    $key  = $args['variable'];
+    $original = $args['original'];
+
+    $chars = '0123456789';
+    if ($key != 'Security.cipherSeed') {
+      $chars .= 'abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ';
+      $chars .= '!@#$%^&*()';
+      $chars .= '-_ []{}<>~`+=,.;:/?|';
+    }
+
+    // Convert the hash to an int to seed the RNG
+    srand(hexdec(substr($hash,0,8)));
+    // Create a random string the same length as the default
+    $val = '';
+    for($i = 1; $i <= strlen($original); $i++){
+      $val .= substr( $chars, rand(0,strlen($chars))-1, 1);
+    }
+    // Reset the RNG
+    srand();
+    // Set the value
+    return $val;
   }
-
-  // Convert the hash to an int to seed the RNG
-  srand(hexdec(substr($hash,0,8)));
-  // Create a random string the same length as the default
-  $val = '';
-  for($i = 1; $i <= strlen($original); $i++){
-    $val .= substr( $chars, rand(0,strlen($chars))-1, 1);
-  }
-  // Reset the RNG
-  srand();
-  // Set the value
-  return $val;
 }
 
 // Generate OpenShift secure keys (or return defaults if not on OpenShift)

app/Test/Case/AllTestsTest.php

@@ -0,0 +1,9 @@
+<?php
+
+class AllTestsTest extends CakeTestSuite {
+  public static function suite() {
+    $suite = new CakeTestSuite('All tests');
+    $suite->addTestDirectoryRecursive(TESTS . 'Case');
+    return $suite;
+  }
+}

app/Test/Case/Controller/PagesControllerTest.php

@@ -0,0 +1,19 @@
+<?php
+App::uses('PagesController', 'Controller');
+App::uses('Home', 'View');
+
+class PagesControllerTest extends ControllerTestCase {
+  public function setUp() {
+    parent::setUp();
+    $PagesController = new PagesController();
+    $HomeView = new View($PagesController);
+  }
+
+  public function testHomePageContents() {
+    $result = $this->testAction('/',
+      array('method' => 'get', 'return' => 'contents')
+    );
+
+    $this->assertContains('Welcome to your CakePHP application on OpenShift',$result);
+  }
+}

composer.json

@@ -0,0 +1,33 @@
+{
+	"name": "cakephp/cakephp",
+	"description": "The CakePHP framework",
+	"type": "library",
+	"keywords": ["framework"],
+	"homepage": "http://cakephp.org",
+	"license": "MIT",
+	"authors": [
+		{
+			"name": "CakePHP Community",
+			"homepage": "https://github.com/cakephp/cakephp/graphs/contributors"
+		}
+	],
+	"support": {
+		"issues": "https://github.com/cakephp/cakephp/issues",
+		"forum": "http://stackoverflow.com/tags/cakephp",
+		"irc": "irc://irc.freenode.org/cakephp",
+		"source": "https://github.com/cakephp/cakephp"
+	},
+	"require": {
+		"php": ">=5.3.0"
+	},
+	"require-dev": {
+		"phpunit/phpunit": "3.7.38",
+		"cakephp/cakephp-codesniffer": "^1.0.0"
+	},
+	"config": {
+		"vendor-dir": "app/Vendor"
+	},
+	"bin": [
+		"lib/Cake/Console/cake"
+	]
+}