Skip to content

Commit

Permalink
Merge pull request #6 from oehlschl/phar
Browse files Browse the repository at this point in the history
fix autoloading in phar
  • Loading branch information
andreaskweber committed Oct 6, 2015
2 parents c4b222f + fc056eb commit 671f699
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions phpjunitmerge
Original file line number Diff line number Diff line change
Expand Up @@ -2,21 +2,21 @@
<?php
/**
* phpjunitmerge
*
*
* The MIT License (MIT)
*
*
* Copyright (c) 2014, Andreas Weber <[email protected]>.
*
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
*
*
* The above copyright notice and this permission notice shall be included in all
* copies or substantial portions of the Software.
*
*
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
Expand All @@ -34,7 +34,7 @@

$loaded = false;

foreach (array(__DIR__ . '/../../autoload.php', __DIR__ . '/vendor/autoload.php') as $file) {
foreach (array('phar://' . __FILE__ . '/vendor/autoload.php', __DIR__ . '/../../autoload.php', __DIR__ . '/vendor/autoload.php') as $file) {
if (file_exists($file)) {
require $file;
$loaded = true;
Expand Down

0 comments on commit 671f699

Please sign in to comment.