markstory

<?php
App::uses('AppController', 'Controller');

class TasksController extends AppController {

	public $components = ['Session', 'Paginator', 'RequestHandler'];

	public function index() {
		$this->Task->recursive = 0;
		$this->Paginator->settings = $this->paginate;

markstory

=====> Downloading Buildpack: https://github.com/heroku/heroku-buildpack-php.git
=====> Detected Framework: PHP
-----> No runtime requirements in composer.json, defaulting to PHP 5.6.3.
-----> Installing system packages...
       - PHP 5.6.3
       - Apache 2.4.10
       - Nginx 1.6.0
-----> Installing PHP extensions...
       - zend-opcache (automatic; bundled, using 'ext-zend-opcache.ini')
-----> Installing dependencies...

markstory

<?php
namespace App\Controller;

use Cake\Form\Form;
use App\Controller\AppController;

class UsersController extends AppController
{
      public function contact()
      {

markstory

<?php
namespace App\Shell;

use Cake\Console\Shell;
use Cake\Event\EventManager;

class EventShell extends Shell
{
    public function main()
    {

markstory

<?php
namespace App\Model\Entity;

use Cake\ORM\Entity;

/**
 * User Entity.
 */
class User extends Entity
{

markstory

<?php
namespace Test;

use PHPUnit_Framework_TestSuite;
use RecursiveDirectoryIterator;
use RecursiveIteratorIterator;
use RegexIterator;

class TestSuite extends PHPUnit_Framework_TestSuite
{

markstory

<?php
namespace App\Controller;

use App\Controller\AppController;

/**
 * Bookmarks Controller
 *
 * @property App\Model\Table\BookmarksTable $Bookmarks
 */

markstory

<?php
App::uses('ArticlesController', 'Controller');

/**
 * ArticlesController Test Case
 *
 */
class ArticlesControllerTest extends ControllerTestCase {

/**

markstory

<?php
namespace App\Controller;

use Cake\Controller\Controller;

/**
 * Application Controller
 *
 * Add your application-wide methods in the class below, your controllers
 * will inherit them.

markstory

#! /usr/bin/env python

import os, re

def main():
    """Fix the stupid merge conflicts.."""

    for root, dirs, files in os.walk('.'):
        if '.git' in dirs:
            dirs.remove('.git')  # don't visit .git directories