Mercurial Mercurial > corpus_parole / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
server/src/app/Libraries/Mergers/JsonDocumentMerger.php
author nowmad@23.1.168.192.in-addr.arpa
Tue, 19 Jan 2016 19:06:17 +0100
changeset 86 15ded106ef1a
parent 28 b0b56e0f8c7f
permissions -rw-r--r--
add a player component to handle sound play/pause
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
28
b0b56e0f8c7f Add contributor edition
ymh <ymh.work@gmail.com>
parents:
diff changeset 
     1
 
<?php
b0b56e0f8c7f Add contributor edition
ymh <ymh.work@gmail.com>
parents:
diff changeset 
     2
 
namespace CorpusParole\Libraries\Mergers;
b0b56e0f8c7f Add contributor edition
ymh <ymh.work@gmail.com>
parents:
diff changeset 
     3
 












b0b56e0f8c7f
Add contributor edition



ymh <ymh.work@gmail.com>


parents: 

diff
changeset




     4


class JsonDocumentMerger {












b0b56e0f8c7f
Add contributor edition



ymh <ymh.work@gmail.com>


parents: 

diff
changeset




     5














b0b56e0f8c7f
Add contributor edition



ymh <ymh.work@gmail.com>


parents: 

diff
changeset




     6


    public function mergeJSON($doc, $jsonDoc) {












b0b56e0f8c7f
Add contributor edition



ymh <ymh.work@gmail.com>


parents: 

diff
changeset




     7














b0b56e0f8c7f
Add contributor edition



ymh <ymh.work@gmail.com>


parents: 

diff
changeset




     8


        return $doc;












b0b56e0f8c7f
Add contributor edition



ymh <ymh.work@gmail.com>


parents: 

diff
changeset




     9


    }












b0b56e0f8c7f
Add contributor edition



ymh <ymh.work@gmail.com>


parents: 

diff
changeset




    10


}














corpus_parole